diff --git a/ChangeLog b/ChangeLog
index 0516ecc9b34..f3e3bb08194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,9 +9,8 @@ For users:
 ---------------
 
 NEW: Minimal PHP version is now PHP 7.0 instead of PHP 5.6
-NEW: #21750 Added "Get lines and Post lines from BOM" at the REST Service
 NEW: #21780 Add pid field to Cronjob class and store PID on job execution
-NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD
+NEW: #19680 Add option PRODUCT_ALLOW_EXTERNAL_DOWNLOAD to automatically have uploaded files shared publicly by a link
 NEW: #20650 can move the checkbox column on left (experimental option)
 NEW: #21000 Added columns 'alias_name' on poject, supplier invoice, supplier order, supplier proposals and taks list
 NEW: #21395 Added option for dark theme mode in display - color and theme
@@ -19,11 +18,9 @@ NEW: #21397 added option to auto define barcode numbers for third-parties in bar
 NEW: #21399
 NEW: #21442 Enhancement of module builder init
 NEW: #21654 add bank account number used on invoices for debit
-NEW: #21775 Template 03 manages send mails
 NEW: #22048 Added notes to productlot module
-NEW: #22298 Bank - Add salaries & vat in tab planned entries
+NEW: #22298 Bank - Add salaries & vat in the tab of planned entries of a bank account
 NEW: #22328
-NEW: #22370 Modulebuilder supports 'alwayseditable' (like extrafields)
 NEW: #22424
 NEW: #22500 member module set up made easier
 NEW: #22527 projects and thirdparties can be viewed as conversation ("Message" view), like events/agenda.
@@ -57,7 +54,6 @@ NEW: Add hidden option MAIN_EMAIL_SUPPORT_ACK to restore Email ack checkbox (fea
 NEW: Add IMAP port setting on email collector module
 NEW: Adding JAPAN Chart-of-Account and regions/departments
 NEW: Adding NIF verification for Algeria
-NEW: Add 4 other templates in website module
 NEW: Add link to create an element from the category page
 NEW: add margin infos to takepos invoice lines
 NEW: Add max size send for "backup and link to mail" option
@@ -98,6 +94,7 @@ NEW: Website Can remove a website template
 NEW: Website can set header "Strict-Transport-Security" in web sites.
 NEW: Website Can switch status of website and page from the website toolbar
 NEW: Website Templates of websites are now directories and not zip into core repo
+NEW: Website Add 4 other templates in website module
 NEW: Can use products categories to make inventory
 NEW: Change filter type on tickets list into a multiselect combo
 NEW: conf TIMESPENT_ALWAYS_UPDATE_THM, when it's on we always check current thm of user to update it in task time line
@@ -129,7 +126,6 @@ NEW: manage no email with thirdparties (better for GDPR)
 NEW: Manage Position (Rank) on Contract Lines
 NEW: Manage VAT on all lines on purchases cycle
 NEW: manage virtual stock at a future date
-NEW: ModuleBuilder can generate code of class from an existing SQL table
 NEW: On a bank reconciled line, we can modify the bank receipt
 NEW: On a form to send an email, we show all emails of all contacts of object
 NEW: Option PRODUCTBATCH_SHOW_WAREHOUSE_ON_SHIPMENT showing wh on PDF
@@ -163,7 +159,6 @@ NEW: SMTP using oauth2 authentication
 NEW: can substitue project title in mail template
 NEW: Supplier order list - Add column private and public note
 NEW: Support IP type in extrafields
-NEW: support multilang in Civilities API
 NEW: Table of membership types
 NEW: The purge of files can purge only if older than a number of seconds
 NEW: Update ActionComm type_code on email message ticket
@@ -174,8 +169,11 @@ NEW: expand/collapse permissions on user permission page
 For developers or integrators:
 ------------------------------
 
+NEW: ModuleBuilder can generate code of class from an existing SQL table
+NEW: #22370 Modulebuilder supports 'alwayseditable' (like extrafields)
 NEW: #20912 Add trigger to record the event of sending an email from a project
-NEW: Removed completely the need for library adodbtime
+NEW: #21750 Added "Get lines and Post lines from BOM" at the REST Service
+NEW: Removed completely the need for the library adodbtime
 NEW: hook on agenda pages
 NEW: hook to complete payment in TakePOS
 NEW: hook "changeHelpURL" to modify target of the help button
@@ -186,6 +184,7 @@ NEW: Add new hooks for actioncomm
 NEW: conf->global->SYSLOG_FILE_ONEPERSESSION accept a string
 NEW: translate for contact type API, setup/ticket API, shipping method API
 NEW: All ajax pages have now a top_httphead()
+NEW: support multilang in Civilities API
 NEW: Add API for the partnership module
 NEW: Add "Get lines and Post lines from BOM" in the API
 NEW: Replace fk_categories_product with categories_product in inventory
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index abf16cee764..b2381db6ba3 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -621,7 +621,6 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/scripts`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/src`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nnnick/chartjs/test`;
-        $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/lib/Mail`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/nusoap/samples`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/php-iban/docs`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/sabre/sabre/*/tests`;
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 642dca887b2..d42aa6cae7c 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -347,6 +347,10 @@ if (empty($reshook)) {
 		$filter['t.numero_compte<='] = $search_accountancy_code_end;
 		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
 	}
+	if (!empty($search_accountancy_aux_code)) {
+		$filter['t.subledger_account'] = $search_accountancy_aux_code;
+		$param .= '&search_accountancy_aux_code='.urlencode($search_accountancy_aux_code);
+	}
 	if (!empty($search_accountancy_aux_code_start)) {
 		$filter['t.subledger_account>='] = $search_accountancy_aux_code_start;
 		$param .= '&search_accountancy_aux_code_start='.urlencode($search_accountancy_aux_code_start);
@@ -989,7 +993,7 @@ if ($massactionbutton && $contextpage != 'poslist') {
 $moreforfilter = '';
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -1001,7 +1005,13 @@ print '<table class="tagtable liste centpercent">';
 
 // Filters lines
 print '<tr class="liste_titre_filter">';
-
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 // Movement number
 if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
@@ -1137,13 +1147,18 @@ if (!empty($arrayfields['t.import_key']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre center">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, "", $sortfield, $sortorder);
 }
@@ -1193,7 +1208,9 @@ if (!empty($arrayfields['t.date_validated']['checked'])) {
 if (!empty($arrayfields['t.import_key']['checked'])) {
 	print_liste_field_titre($arrayfields['t.import_key']['label'], $_SERVER["PHP_SELF"], "t.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 
@@ -1248,6 +1265,18 @@ while ($i < min($num, $limit)) {
 	$total_credit += $line->credit;
 
 	print '<tr class="oddeven">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowraponall center">';
+		if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($line->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$line->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$line->id.'"'.($selected ? ' checked="checked"' : '').' />';
+		}
+		print '</td>';
+	}
 
 	// Piece number
 	if (!empty($arrayfields['t.piece_num']['checked'])) {
@@ -1452,15 +1481,17 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Action column
-	print '<td class="nowraponall center">';
-	if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($line->id, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowraponall center">';
+		if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($line->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$line->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$line->id.'"'.($selected ? ' checked="checked"' : '').' />';
 		}
-		print '<input id="cb'.$line->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$line->id.'"'.($selected ? ' checked="checked"' : '').' />';
+		print '</td>';
 	}
-	print '</td>';
 
 	if (!$i) {
 		$totalarray['nbfield']++;
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 7ab6666d4c4..34e8b18c52c 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -686,7 +686,7 @@ if ($massaction == 'preunletteringauto') {
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 if ($massactionbutton && $contextpage != 'poslist') {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -740,7 +740,13 @@ print '<table class="tagtable liste centpercent">';
 
 // Filters lines
 print '<tr class="liste_titre_filter">';
-
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 // Movement number
 if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_mvt_num" class="width50" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
@@ -819,13 +825,18 @@ $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // N
 print $hookmanager->resPrint;
 
 // Action column
-print '<td class="liste_titre center">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['t.piece_num']['checked'])) {
 	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
 }
@@ -863,7 +874,9 @@ if (!empty($arrayfields['t.import_key']['checked'])) {
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 $displayed_account_number = null; // Start with undefined to be able to distinguish with empty
@@ -976,7 +989,18 @@ while ($i < min($num, $limit)) {
 	}
 
 	print '<tr class="oddeven">';
-
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowraponall center">';
+		if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($line->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb' . $line->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $line->id . '"' . ($selected ? ' checked="checked"' : '') . ' />';
+		}
+		print '</td>';
+	}
 	// Piece number
 	if (!empty($arrayfields['t.piece_num']['checked'])) {
 		print '<td>';
@@ -1149,15 +1173,17 @@ while ($i < min($num, $limit)) {
 	print $hookmanager->resPrint;
 
 	// Action column
-	print '<td class="nowraponall center">';
-	if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($line->id, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowraponall center">';
+		if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($line->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb' . $line->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $line->id . '"' . ($selected ? ' checked="checked"' : '') . ' />';
 		}
-		print '<input id="cb' . $line->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $line->id . '"' . ($selected ? ' checked="checked"' : '') . ' />';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index c7373fd02db..8f76f9a7b2b 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -53,27 +53,20 @@ if ($action == 'set') {
 		$error++;
 	}
 
-	if (!$error && $gimcdf && !file_exists($gimcdf)) {
-		setEventMessages($langs->trans("ErrorFileNotFound", $gimcdf), null, 'errors');
+	$res1 = dolibarr_set_const($db, "GEOIP_VERSION", GETPOST('geoipversion', 'aZ09'), 'chaine', 0, '', $conf->entity);
+	if (!($res1 > 0)) {
+		$error++;
+	}
+
+	$res2 = dolibarr_set_const($db, "GEOIPMAXMIND_COUNTRY_DATAFILE", $gimcdf, 'chaine', 0, '', $conf->entity);
+	if (!($res2 > 0)) {
 		$error++;
 	}
 
 	if (!$error) {
-		$res1 = dolibarr_set_const($db, "GEOIP_VERSION", GETPOST('geoipversion', 'aZ09'), 'chaine', 0, '', $conf->entity);
-		if (!($res1 > 0)) {
-			$error++;
-		}
-
-		$res2 = dolibarr_set_const($db, "GEOIPMAXMIND_COUNTRY_DATAFILE", $gimcdf, 'chaine', 0, '', $conf->entity);
-		if (!($res2 > 0)) {
-			$error++;
-		}
-
-		if (!$error) {
-			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("Error"), null, 'errors');
-		}
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		//setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -112,8 +105,8 @@ print '<td class="right"><input type="submit" class="button button-edit" value="
 print "</tr>\n";
 
 // Lib version
-print '<tr class="oddeven"><td width="50%">'.$langs->trans("GeoIPLibVersion").'</td>';
-print '<td colspan="2">';
+print '<tr class="oddeven"><td>'.$langs->trans("GeoIPLibVersion").'</td>';
+print '<td>';
 $arrayofvalues = array('php' => 'Native PHP functions', '1' => 'Embedded GeoIP v1', '2' => 'Embedded GeoIP v2');
 print $form->selectarray('geoipversion', $arrayofvalues, (isset($conf->global->GEOIP_VERSION) ? $conf->global->GEOIP_VERSION : '2'));
 if ($conf->global->GEOIP_VERSION == 'php') {
@@ -124,16 +117,29 @@ if ($conf->global->GEOIP_VERSION == 'php') {
 		print '<br>'.$langs->trans("Version").': '.$version;
 	}
 }
+print '</td>';
+print '<td>';
 print '</td></tr>';
 
+$gimcdf = getDolGlobalString('GEOIPMAXMIND_COUNTRY_DATAFILE');
+
 // Path to database file
 print '<tr class="oddeven"><td>'.$langs->trans("PathToGeoIPMaxmindCountryDataFile").'</td>';
-print '<td colspan="2">';
-
+print '<td>';
 if ($conf->global->GEOIP_VERSION == 'php') {
 	print 'Using geoip PHP internal functions. Value must be '.geoip_db_filename(GEOIP_COUNTRY_EDITION).' or '.geoip_db_filename(GEOIP_CITY_EDITION_REV1).' or /pathtodatafile/GeoLite2-Country.mmdb<br>';
 }
-print '<input type="text" class="minwidth200" name="GEOIPMAXMIND_COUNTRY_DATAFILE" value="'.dol_escape_htmltag($conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE).'">';
+print '<input type="text" class="minwidth200" name="GEOIPMAXMIND_COUNTRY_DATAFILE" value="'.dol_escape_htmltag(getDolGlobalString('GEOIPMAXMIND_COUNTRY_DATAFILE')).'">';
+if (!file_exists($gimcdf)) {
+	print '<div class="error">'.$langs->trans("ErrorFileNotFound", $gimcdf).'</div>';
+}
+print '</td><td>';
+print '<span class="opacitymedium">';
+print $langs->trans("Example").'<br>';
+print '/usr/local/share/GeoIP/GeoIP.dat<br>
+/usr/share/GeoIP/GeoIP.dat<br>
+/usr/share/GeoIP/GeoLite2-Country.mmdb';
+print '</span>';
 print '</td></tr>';
 
 print '</table>';
@@ -145,12 +151,16 @@ print '<br>';
 print $langs->trans("NoteOnPathLocation").'<br>';
 
 $url1 = 'http://www.maxmind.com/en/city?rId=awstats';
-print $langs->trans("YouCanDownloadFreeDatFileTo", '<a href="'.$url1.'" target="_blank" rel="noopener noreferrer external">'.$url1.'</a>');
+$textoshow = $langs->trans("YouCanDownloadFreeDatFileTo", '{s1}');
+$textoshow = str_replace('{s1}', '<a href="'.$url1.'" target="_blank" rel="noopener noreferrer external">'.$url1.'</a>', $textoshow);
+print $textoshow;
 
 print '<br>';
 
 $url2 = 'http://www.maxmind.com/en/city?rId=awstats';
-print $langs->trans("YouCanDownloadAdvancedDatFileTo", '<a href="'.$url2.'" target="_blank" rel="noopener noreferrer external">'.$url2.'</a>');
+$textoshow = $langs->trans("YouCanDownloadAdvancedDatFileTo", '{s1}');
+$textoshow = str_replace('{s1}', '<a href="'.$url2.'" target="_blank" rel="noopener noreferrer external">'.$url2.'</a>', $textoshow);
+print $textoshow;
 
 if ($geoip) {
 	print '<br><br>';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 035830a0878..e9a8132188c 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -455,6 +455,25 @@ if ($action == 'edit') {
 	}
 	print '</td></tr>';
 
+	// Auth mode
+	if (!empty($conf->use_javascript_ajax) || (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_auth_method"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
+			// Note: Default value for MAIN_MAIL_SMTPS_AUTH_TYPE if not defined is 'LOGIN' (but login/pass may be empty and they won't be provided in such a case)
+			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN') == 'LOGIN' ? ' checked' : '').'> ';
+			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
+			print '&nbsp; &nbsp; &nbsp;';
+			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') == 'XOAUTH2' ? ' checked' : '').'> ';
+			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
+		} else {
+			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN');
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
+			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="'.$value.'">';
+		}
+		print '</td></tr>';
+	}
+
 	// ID
 	if (!empty($conf->use_javascript_ajax) || (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')))) {
 		$mainstmpid = (!empty($conf->global->MAIN_MAIL_SMTPS_ID) ? $conf->global->MAIN_MAIL_SMTPS_ID : '');
@@ -471,24 +490,6 @@ if ($action == 'edit') {
 	}
 
 
-	// OAUTH
-	if (!empty($conf->use_javascript_ajax) || (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')))) {
-		print '<tr class="oddeven smtp_auth_method"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
-		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
-			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') == 'LOGIN' ? ' checked' : '').'> ';
-			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') == 'XOAUTH2' ? ' checked' : '').'> ';
-			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
-		} else {
-			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN');
-			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
-			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="'.$value.'">';
-		}
-		print '</td></tr>';
-	}
-
 	// PW
 	if (!empty($conf->use_javascript_ajax) || (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')))) {
 		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW) ? $conf->global->MAIN_MAIL_SMTPS_PW : '');
@@ -705,11 +706,6 @@ if ($action == 'edit') {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
 		}
 
-		// SMTPS ID
-		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
-			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
-		}
-
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN');
@@ -717,6 +713,11 @@ if ($action == 'edit') {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
+		// SMTPS ID
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer'))) {
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
+		}
+
 		// SMTPS PW
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail'), array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') != "XOAUTH2") {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'</td></tr>';
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index d2eabd95e2b..b9cb57e0d80 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -34,10 +34,6 @@ $langs->loadLangs(array('companies', 'products', 'admin', 'mails', 'other', 'err
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 
-if (!$user->admin) {
-	accessforbidden();
-}
-
 $usersignature = $user->signature;
 // For action = test or send, we ensure that content is not html, even for signature, because this we want a test with NO html.
 if ($action == 'test' || $action == 'send') {
@@ -61,6 +57,10 @@ $substitutionarrayfortest = array(
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
 
+// Security check
+if (!$user->admin) {
+	accessforbidden();
+}
 
 
 /*
@@ -394,6 +394,25 @@ if ($action == 'edit') {
 	}
 	print '</td></tr>';
 
+	// AUTH method
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_auth_method hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
+			// Note: Default value for MAIN_MAIL_SMTPS_AUTH_TYPE if not defined is 'LOGIN' (but login/pass may be empty and they won't be provided in such a case)
+			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN') == 'LOGIN' ? ' checked' : '').'> ';
+			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING') == 'XOAUTH2' ? ' checked' : '').'> ';
+			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
+		} else {
+			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
+			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="'.$value.'">';
+		}
+		print '</td></tr>';
+	}
+
 	// ID
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
 		$mainstmpid = (!empty($conf->global->MAIN_MAIL_SMTPS_ID_EMAILING) ? $conf->global->MAIN_MAIL_SMTPS_ID_EMAILING : '');
@@ -409,24 +428,6 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
-		// OAUTH
-	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
-		print '<tr class="oddeven smtp_auth_method hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
-			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING') == 'LOGIN' ? ' checked' : '').'> ';
-			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING') == 'XOAUTH2' ? ' checked' : '').'> ';
-			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
-		} else {
-			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
-			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
-			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING" value="'.$value.'">';
-		}
-		print '</td></tr>';
-	}
-
 	// PW
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
 		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW_EMAILING) ? $conf->global->MAIN_MAIL_SMTPS_PW_EMAILING : '');
@@ -442,7 +443,7 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
-		// OAUTH service provider
+	// OAUTH service provider
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
 		print '<tr class="oddeven smtp_oauth_service hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").'</td><td>';
 
@@ -546,11 +547,6 @@ if ($action == 'edit') {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '').'</td></tr>';
 		}
 
-		// SMTPS ID
-		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
-			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.getDolGlobalString('MAIN_MAIL_SMTPS_ID_EMAILING').'</td></tr>';
-		}
-
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING', 'LOGIN');
@@ -558,6 +554,11 @@ if ($action == 'edit') {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
+		// SMTPS ID
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.getDolGlobalString('MAIN_MAIL_SMTPS_ID_EMAILING').'</td></tr>';
+		}
+
 		// SMTPS PW
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_EMAILING') != "XOAUTH2") {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', getDolGlobalString('MAIN_MAIL_SMTPS_PW_EMAILING')).'</td></tr>';
@@ -707,8 +708,8 @@ if ($action == 'edit') {
 		$formmail->withfrom = 1;
 		$formmail->witherrorsto = 1;
 		$formmail->withto = (GETPOSTISSET('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
-		$formmail->withtocc = (GETPOSTISSET(['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
-		$formmail->withtoccc = (GETPOSTISSET(['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtocc = (GETPOSTISSET('sendtocc') ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtoccc = (GETPOSTISSET('sendtoccc') ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
 		$formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
 		$formmail->withtopicreadonly = 0;
 		$formmail->withfile = 2;
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index c48146fc937..05d66516cde 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -32,23 +32,28 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 $langs->loadLangs(array('companies', 'products', 'admin', 'mails', 'other', 'errors'));
 
 $action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
 
 $usersignature = $user->signature;
 // For action = test or send, we ensure that content is not html, even for signature, because this we want a test with NO html.
 if ($action == 'test' || $action == 'send') {
-	$usersignature = dol_string_nohtmltag($usersignature);
+	$usersignature = dol_string_nohtmltag($usersignature, 2);
 }
 
 $substitutionarrayfortest = array(
-'__LOGIN__' => $user->login,
-'__ID__' => 'TESTIdRecord',
-'__EMAIL__' => 'TESTEMail',
-'__LASTNAME__' => 'TESTLastname',
-'__FIRSTNAME__' => 'TESTFirstname',
-'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''),
-'__SENDEREMAIL_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
-//'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
+	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+	'__ID__' => 'TESTIdRecord',
+	'__EMAIL__' => 'TESTEMail',
+	'__LOGIN__' => $user->login,
+	'__LASTNAME__' => 'TESTLastname',
+	'__FIRSTNAME__' => 'TESTFirstname',
+	'__ADDRESS__'=> 'RecipientAddress',
+	'__ZIP__'=> 'RecipientZip',
+	'__TOWN_'=> 'RecipientTown',
+	'__COUNTRY__'=> 'RecipientCountry',
+	'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''),
+	'__SENDEREMAIL_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
+	//'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
 
@@ -94,10 +99,10 @@ $trackid = (($action == 'testhtml') ? "testhtml" : "test");
 $sendcontext = 'ticket'; // Force to use dedicated context of setup for ticket
 include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-if ($action == 'presend' && GETPOST('trackid') == 'test') {
+if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'test') {
 	$action = 'test';
 }
-if ($action == 'presend' && GETPOST('trackid') == 'testhtml') {
+if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'testhtml') {
 	$action = 'testhtml';
 }
 
@@ -317,12 +322,15 @@ if ($action == 'edit') {
 
 	// Host server
 
-	print '<tr class="oddeven hideifdefault"><td>';
+	print '<tr class="oddeven hideifdefault">';
 	if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail') {
+		print '<td>';
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
-		print $langs->trans("SeeLocalSendMailSetup");
+		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+		print '</td>';
 	} else {
+		print '<td>';
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER_TICKET) ? $conf->global->MAIN_MAIL_SMTP_SERVER_TICKET : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) {
@@ -333,17 +341,18 @@ if ($action == 'edit') {
 		print '</td><td>';
 		// SuperAdministrator access only
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
-			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER_TICKET" name="MAIN_MAIL_SMTP_SERVER_TICKET" size="18" value="'.$mainserver.'">';
+			print '<input class="flat minwidth300" id="MAIN_MAIL_SMTP_SERVER_TICKET" name="MAIN_MAIL_SMTP_SERVER_TICKET" size="18" value="'.$mainserver.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_TICKET_sav" name="MAIN_MAIL_SMTP_SERVER_TICKET_sav" value="'.$mainserver.'">';
-			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+			print '<span id="smtp_server_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		} else {
 			$text = !empty($mainserver) ? $mainserver : $smtpserver;
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_TICKET" name="MAIN_MAIL_SMTP_SERVER_TICKET" value="'.$mainserver.'">';
 		}
+		print '</td>';
 	}
-	print '</td></tr>';
+	print '</tr>';
 
 	// Port
 
@@ -351,7 +360,7 @@ if ($action == 'edit') {
 	if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE_TICKET == 'mail') {
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
-		print $langs->trans("SeeLocalSendMailSetup");
+		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 	} else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT_TICKET) ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
@@ -365,7 +374,7 @@ if ($action == 'edit') {
 		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_TICKET" name="MAIN_MAIL_SMTP_PORT_TICKET" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_TICKET_sav" name="MAIN_MAIL_SMTP_PORT_TICKET_sav" value="'.$mainport.'">';
-			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+			print '<span id="smtp_port_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -375,6 +384,25 @@ if ($action == 'edit') {
 	}
 	print '</td></tr>';
 
+	// AUTH method
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_auth_method hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
+		if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) {
+			// Note: Default value for MAIN_MAIL_SMTPS_AUTH_TYPE if not defined is 'LOGIN' (but login/pass may be empty and they won't be provided in such a case)
+			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN') == 'LOGIN' ? ' checked' : '').'> ';
+			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET') == 'XOAUTH2' ? ' checked' : '').'> ';
+			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
+		} else {
+			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
+			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="'.$value.'">';
+		}
+		print '</td></tr>';
+	}
+
 	// ID
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
 		$mainstmpid = (!empty($conf->global->MAIN_MAIL_SMTPS_ID_TICKET) ? $conf->global->MAIN_MAIL_SMTPS_ID_TICKET : '');
@@ -390,25 +418,6 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
-	// OAUTH
-	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
-		print '<tr class="oddeven smtp_auth_method hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
-		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
-			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET') == 'LOGIN' ? ' checked' : '').'> ';
-			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
-			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET') == 'XOAUTH2' ? ' checked' : '').'> ';
-			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
-		} else {
-			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
-			$htmltext = $langs->trans("ContactSuperAdminForChange");
-			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
-			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET" value="'.$value.'">';
-		}
-		print '</td></tr>';
-	}
-
-
 	// PW
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) {
 		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW_TICKET) ? $conf->global->MAIN_MAIL_SMTPS_PW_TICKET : '');
@@ -514,11 +523,6 @@ if ($action == 'edit') {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT_TICKET) ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : '').'</td></tr>';
 		}
 
-		// SMTPS ID
-		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))) {
-			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID_TICKET.'</td></tr>';
-		}
-
 		// AUTH method
 		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET'), array('smtps', 'swiftmailer'))) {
 			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET', 'LOGIN');
@@ -526,6 +530,11 @@ if ($action == 'edit') {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>'.$text.'</td></tr>';
 		}
 
+		// SMTPS ID
+		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer'))) {
+			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID_TICKET.'</td></tr>';
+		}
+
 		// SMTPS PW
 		if (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET') != "XOAUTH2") {
 			print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_SMTPS_PW").'</td><td>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW_TICKET).'</td></tr>';
@@ -621,6 +630,7 @@ if ($action == 'edit') {
 
 	// Run the test to connect
 	if ($action == 'testconnect') {
+		print '<div id="formmailaftertstconnect" name="formmailaftertstconnect"></div>';
 		print load_fiche_titre($langs->trans("DoTestServerAvailability"));
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -651,8 +661,8 @@ if ($action == 'edit') {
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
-		$formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname') : $conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail') : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail', 'restricthtml') : $conf->global->MAIN_MAIL_EMAIL_FROM);
 		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
 		$formmail->withfromreadonly = 0;
 		$formmail->withsubstit = 0;
@@ -679,7 +689,7 @@ if ($action == 'edit') {
 		$formmail->param["returnurl"] = $_SERVER["PHP_SELF"];
 
 		// Init list of files
-		if (GETPOST("mode") == 'init') {
+		if (GETPOST("mode", "aZ09") == 'init') {
 			$formmail->clear_attached_files();
 		}
 
diff --git a/htdocs/admin/security.php b/htdocs/admin/security.php
index 02cddbd5d70..063f1668d15 100644
--- a/htdocs/admin/security.php
+++ b/htdocs/admin/security.php
@@ -46,7 +46,7 @@ $allow_disable_encryption = true;
  */
 
 if ($action == 'setgeneraterule') {
-	if (!dolibarr_set_const($db, 'USER_PASSWORD_GENERATED', $_GET["value"], 'chaine', 0, '', $conf->entity)) {
+	if (!dolibarr_set_const($db, 'USER_PASSWORD_GENERATED', GETPOST("value", "alphanohtml"), 'chaine', 0, '', $conf->entity)) {
 		dol_print_error($db);
 	}
 }
@@ -56,7 +56,11 @@ if ($action == 'activate_encrypt') {
 
 	$db->begin();
 
-	dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
+	// On old version a bug created the constant into user entity, so we delete it to be sure, such entry won't exists. We want it in entity 0 or nowhere.
+	dolibarr_del_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
+	// We set entity=0 (all) because DATABASE_PWD_ENCRYPTED is a setup into conf file, so always shared for everybody
+	$entityforall = 0;
+	dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $entityforall);
 
 	$sql = "SELECT u.rowid, u.pass, u.pass_crypted";
 	$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
@@ -377,7 +381,8 @@ if ($conf->global->USER_PASSWORD_GENERATED == "Perso") {
 }
 
 
-// Cryptage mot de passe
+// Crypt passwords in database
+
 print '<br>';
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -393,20 +398,20 @@ print '</tr>';
 // Disable clear password in database
 print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("DoNotStoreClearPassword").'</td>';
-print '<td align="center" width="60">';
+print '<td class="center" width="60">';
 if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
 	print img_picto($langs->trans("Active"), 'tick');
 }
 print '</td>';
 if (!getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
-	print '<td align="center" width="100">';
-	print '<a class="reposition" href="security.php?action=activate_encrypt&token='.newToken().'">'.$langs->trans("Activate").'</a>';
+	print '<td class="center" width="100">';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=activate_encrypt&token='.newToken().'">'.$langs->trans("Activate").'</a>';
 	print "</td>";
 }
 
 // Database conf file encryption
 if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
-	print '<td align="center" width="100">';
+	print '<td class="center" width="100">';
 	if ($allow_disable_encryption) {
 		//On n'autorise pas l'annulation de l'encryption car les mots de passe ne peuvent pas etre decodes
 		//Do not allow "disable encryption" as passwords cannot be decrypted
@@ -419,7 +424,8 @@ if (getDolGlobalString('DATABASE_PWD_ENCRYPTED')) {
 print "</td>";
 print '</tr>';
 
-// Cryptage du mot de base de la base dans conf.php
+
+// Crypt password into config file conf.php
 
 print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("MainDbPasswordFileConfEncrypted").'</td>';
@@ -430,7 +436,7 @@ if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || !empty($dolibarr_main_d
 
 print '</td>';
 
-print '<td align="center" width="100">';
+print '<td class="center" width="100">';
 if (empty($dolibarr_main_db_pass) && empty($dolibarr_main_db_encrypted_pass)) {
 	$langs->load("errors");
 	print img_warning($langs->trans("WarningPassIsEmpty"));
@@ -452,18 +458,18 @@ print '</tr>';
 
 print '<tr class="oddeven">';
 print '<td colspan="3">'.$langs->trans("DisableForgetPasswordLinkOnLogonPage").'</td>';
-print '<td align="center" width="60">';
+print '<td class="center" width="60">';
 if (getDolGlobalString('MAIN_SECURITY_DISABLEFORGETPASSLINK')) {
 	print img_picto($langs->trans("Active"), 'tick');
 }
 print '</td>';
 if (!getDolGlobalString('MAIN_SECURITY_DISABLEFORGETPASSLINK')) {
-	print '<td align="center" width="100">';
+	print '<td class="center" width="100">';
 	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=activate_MAIN_SECURITY_DISABLEFORGETPASSLINK&token='.newToken().'">'.$langs->trans("Activate").'</a>';
 	print "</td>";
 }
 if (getDolGlobalString('MAIN_SECURITY_DISABLEFORGETPASSLINK')) {
-	print '<td align="center" width="100">';
+	print '<td center="center" width="100">';
 	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=disable_MAIN_SECURITY_DISABLEFORGETPASSLINK&token='.newToken().'">'.$langs->trans("Disable").'</a>';
 	print "</td>";
 }
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 1ea81cd5dd3..62b012858b5 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -542,13 +542,13 @@ print '<br>';
 print '<strong>MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL</strong> = '.(empty($conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0)</span>' : $conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL)."<br>";
 print '<br>';
 
-print '<strong>MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"default-src 'self'; img-src *;\")</span><br>";
+print '<strong>MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self'; img-src *;\")</span><br>";
 print '<br>';
 
-print '<strong>MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\")</span><br>";
+print '<strong>MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\" so browser doesn't send any referrer when going into another web site domain)</span><br>";
 print '<br>';
 
-print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;\")</span><br>";
+print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"frame-ancestors 'self'; default-src 'self'; style-src https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src *;\")</span><br>";
 print '<br>';
 
 print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index 8e7643ffc5d..7a91f8f598c 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -113,6 +113,9 @@ $outputdir  = $conf->admin->dir_output.'/backup';
 $result = dol_mkdir($outputdir);
 
 
+$lowmemorydump = GETPOSTISSET("lowmemorydump") ? GETPOST("lowmemorydump") : getDolGlobalString('MAIN_LOW_MEMORY_DUMP');
+
+
 // MYSQL
 if ($what == 'mysql') {
 	$cmddump = GETPOST("mysqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
@@ -132,7 +135,7 @@ if ($what == 'mysql') {
 	}
 
 	if (!$errormsg) {
-		$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+		$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file, 0, 0, $lowmemorydump);
 		$errormsg = $utils->error;
 		$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
 		$_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
@@ -141,7 +144,7 @@ if ($what == 'mysql') {
 
 // MYSQL NO BIN
 if ($what == 'mysqlnobin') {
-	$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+	$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file, 0, 0, $lowmemorydump);
 
 	$errormsg = $utils->error;
 	$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
@@ -170,7 +173,7 @@ if ($what == 'postgresql') {
 	}
 
 	if (!$errormsg) {
-		$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file);
+		$utils->dumpDatabase(GETPOST('compression', 'alpha'), $what, 0, $file, 0, 0, $lowmemorydump);
 		$errormsg = $utils->error;
 		$_SESSION["commandbackuplastdone"] = $utils->result['commandbackuplastdone'];
 		$_SESSION["commandbackuptorun"] = $utils->result['commandbackuptorun'];
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 3374204e22f..6e3d5c41925 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -513,7 +513,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
@@ -523,6 +523,15 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
+
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -561,16 +570,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -593,7 +608,9 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 print '</tr>'."\n";
 
 
@@ -624,6 +641,18 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Show here line of result
 	print '<tr class="oddeven">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -676,15 +705,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index a133e3cc314..5de2d02bc92 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1399,7 +1399,6 @@ class ActionComm extends CommonObject
 		if (empty($user->rights->agenda->allactions->read)) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."actioncomm_resources AS ar ON a.id = ar.fk_actioncomm AND ar.element_type ='user' AND ar.fk_element = ".((int) $user->id);
 		}
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 		$sql .= " WHERE 1 = 1";
 		if (empty($load_state_board)) {
 			$sql .= " AND a.percent >= 0 AND a.percent < 100";
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 4532e49b622..27c4988ffd8 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -715,7 +715,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 $moreforfilter = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -729,6 +729,13 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 print '<tr class="liste_titre_filter">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 if (!empty($arrayfields['a.id']['checked'])) {
 	print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
 }
@@ -795,10 +802,12 @@ if (!empty($arrayfields['a.percent']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre" align="middle">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 $totalarray = array();
@@ -807,6 +816,9 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+}
 if (!empty($arrayfields['a.id']['checked'])) {
 	print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
 	$totalarray['nbfield']++;
@@ -868,7 +880,9 @@ if (!empty($arrayfields['a.percent']['checked'])) {
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
 	$totalarray['nbfield']++;
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+}
 $totalarray['nbfield']++;
 print "</tr>\n";
 
@@ -921,7 +935,18 @@ while ($i < $imaxinloop) {
 	}
 
 	print '<tr class="oddeven">';
-
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	// Ref
 	if (!empty($arrayfields['a.id']['checked'])) {
 		print '<td class="nowraponall">';
@@ -1100,15 +1125,17 @@ while ($i < $imaxinloop) {
 		print '<td align="center" class="nowrap">'.$actionstatic->LibStatut($obj->percent, 5, 0, $datep).'</td>';
 	}
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->id, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 
 	print '</tr>'."\n";
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 4d59a75fb1b..f578aa75cf5 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -158,7 +158,7 @@ if (empty($reshook)) {
 		$action = "";
 	}
 
-	// set accountancy code
+	// Set accountancy code
 	if ($action == 'setcustomeraccountancycode') {
 		$result = $object->fetch($id);
 		$object->code_compta_client = GETPOST("customeraccountancycode");
@@ -169,7 +169,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// terms of the settlement
+	// Payment terms of the settlement
 	if ($action == 'setconditions' && $user->rights->societe->creer) {
 		$object->fetch($id);
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'), GETPOST('cond_reglement_id_deposit_percent', 'alpha'));
@@ -178,7 +178,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// mode de reglement
+	// Payment mode
 	if ($action == 'setmode' && $user->rights->societe->creer) {
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
@@ -187,7 +187,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// transport mode
+	// Transport mode
 	if ($action == 'settransportmode' && $user->rights->societe->creer) {
 		$object->fetch($id);
 		$result = $object->setTransportMode(GETPOST('transport_mode_id', 'alpha'));
@@ -421,7 +421,7 @@ if ($object->id > 0) {
 	print "</td>";
 	print '</tr>';
 
-	// Mode de reglement par defaut
+	// Default payment mode
 	print '<tr><td class="nowrap">';
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('PaymentMode');
@@ -440,7 +440,7 @@ if ($object->id > 0) {
 	print '</tr>';
 
 	if (isModEnabled("banque")) {
-		// Compte bancaire par défaut
+		// Default bank account for payments
 		print '<tr><td class="nowrap">';
 		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 		print $langs->trans('PaymentBankAccount');
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 72ec408524c..bd3d54977f1 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -522,9 +522,10 @@ if (empty($reshook)) {
 				exit;
 			}
 			$mesgs[] = $object->error;
+			$mesgs = array_merge($mesgs, $object->errors);
 		}
 
-		setEventMessages(null, $mesgs, 'errors');
+		setEventMessages('', $mesgs, 'errors');
 		$action = "create";
 	}
 
@@ -609,9 +610,10 @@ if (empty($reshook)) {
 					exit;
 				}
 				$mesgs[] = $object->error;
+				$mesgs = array_merge($mesgs, $object->errors);
 			}
 
-			setEventMessages($mesg, $mesgs, 'errors');
+			setEventMessages('', $mesgs, 'errors');
 			$action = "edit";
 		} else {
 			$action = "edit";
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 1d2631c0b6c..eb1791285c0 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -209,12 +209,12 @@ $checkedtypetiers = 0;
 $arrayfields = array(
 	'p.ref'=>array('label'=>"Ref", 'checked'=>1),
 	'p.ref_client'=>array('label'=>"RefCustomer", 'checked'=>-1),
-	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(!isModEnabled('project') ? 0 : 1)),
-	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(!isModEnabled('project') ? 0 : 1)),
+	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(isModEnabled('project') ? 1 : 0)),
+	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(isModEnabled('project') ? 1 : 0)),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1),
 	's.town'=>array('label'=>"Town", 'checked'=>-1),
-	's.zip'=>array('label'=>"Zip", 'checked'=>1),
+	's.zip'=>array('label'=>"Zip", 'checked'=>-1),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
 	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
@@ -1430,6 +1430,14 @@ if ($resql) {
 	}
 	print "</tr>\n";
 
+	$totalarray = array(
+		'nbfield' => 0,
+		'val' => array(
+			'p.total_ht' => 0,
+			'p.total_tva' => 0,
+			'p.total_ttc' => 0,
+		),
+	);
 
 	// Fields title
 	print '<tr class="liste_titre">';
@@ -1550,14 +1558,6 @@ if ($resql) {
 	if (!empty($arrayfields['total_mark_rate']['checked'])) {
 		print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
 	}
-	$totalarray = array(
-		'nbfield' => 0,
-		'val' => array(
-			'p.total_ht' => 0,
-			'p.total_tva' => 0,
-			'p.total_ttc' => 0,
-		),
-	);
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
@@ -1570,6 +1570,7 @@ if ($resql) {
 	);
 
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['p.datec']['checked'])) {
 		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, 'align="center" class="nowrap"', $sortfield, $sortorder);
@@ -1614,6 +1615,7 @@ if ($resql) {
 	$savnbfield = $totalarray['nbfield'];
 	$totalarray = array();
 	$totalarray['nbfield'] = 0;
+
 	$imaxinloop = ($limit ? min($num, $limit) : $num);
 	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
@@ -2076,7 +2078,7 @@ if ($resql) {
 
 		if (!empty($arrayfields['sale_representative']['checked'])) {
 			// Sales representatives
-			print '<td class="tdoverflowmax200">';
+			print '<td class="tdoverflowmax150">';
 			if ($obj->socid > 0) {
 				$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
 				if ($listsalesrepresentatives < 0) {
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 54cd0f2b58c..faf1c52a0c0 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -59,7 +59,10 @@ $search_number = GETPOST('search_number', 'alpha');
 $search_status = GETPOST('search_status') ?GETPOST('search_status', 'alpha') : 'opened'; // 'all' or ''='opened'
 $optioncss = GETPOST('optioncss', 'alpha');
 
-$search_category_list = GETPOST("search_category_".Categorie::TYPE_ACCOUNT."_list", "array");
+$search_category_list ="";
+if (isModEnabled('categorie')) {
+	$search_category_list = GETPOST("search_category_".Categorie::TYPE_ACCOUNT."_list", "array");
+}
 
 $socid = 0;
 // Security check
@@ -384,7 +387,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -393,7 +396,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
-
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 // Ref
 if (!empty($arrayfields['b.ref']['checked'])) {
 	print '<td class="liste_titre">';
@@ -469,15 +478,20 @@ if (!empty($arrayfields['balance']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['b.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['b.ref']['label'], $_SERVER["PHP_SELF"], 'b.ref', '', $param, '', $sortfield, $sortorder);
 }
@@ -520,7 +534,9 @@ if (!empty($arrayfields['b.clos']['checked'])) {
 if (!empty($arrayfields['balance']['checked'])) {
 	print_liste_field_titre($arrayfields['balance']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 
@@ -551,7 +567,18 @@ foreach ($accounts as $key => $type) {
 	}
 
 	print '<tr class="oddeven">';
-
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($objecttmp->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	// Ref
 	if (!empty($arrayfields['b.ref']['checked'])) {
 		print '<td class="nowraponall">'.$objecttmp->getNomUrl(1).'</td>';
@@ -734,15 +761,17 @@ foreach ($accounts as $key => $type) {
 	}
 
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($objecttmp->id, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($objecttmp->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$objecttmp->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$objecttmp->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 2bfdf9d1f66..062d041c81a 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -567,16 +567,17 @@ if (isModEnabled('socialnetworks')) {
 		if ($value['active'] && strlen($search_[$key])) {
 			$searchkeyinjsonformat = preg_replace('/"$/', '', preg_replace('/^"/', '', json_encode($search_[$key])));
 			if (in_array($db->type, array('mysql', 'mysqli'))) {
-				$sql .= " AND p.socialnetworks REGEXP '\"".$db->escapeforlike($db->escape($key))."\":\"[^\"]*".$db->escapeforlike($db->escape($searchkeyinjsonformat))."'";
+				$sql .= " AND p.socialnetworks REGEXP '\"".$db->escape($db->escapeforlike($key))."\":\"[^\"]*".$db->escape($db->escapeforlike($searchkeyinjsonformat))."'";
 			} elseif ($db->type == 'pgsql') {
-				$sql .= " AND p.socialnetworks ~ '\"".$db->escapeforlike($db->escape($key))."\":\"[^\"]*".$db->escapeforlike($db->escape($searchkeyinjsonformat))."'";
+				$sql .= " AND p.socialnetworks ~ '\"".$db->escape($db->escapeforlike($key))."\":\"[^\"]*".$db->escape($db->escapeforlike($searchkeyinjsonformat))."'";
 			} else {
 				// Works with all database but not reliable because search only for social network code starting with earched value
-				$sql .= " AND p.socialnetworks LIKE '%\"".$db->escapeforlike($db->escape($key))."\":\"".$db->escapeforlike($db->escape($searchkeyinjsonformat))."%'";
+				$sql .= " AND p.socialnetworks LIKE '%\"".$db->escape($db->escapeforlike($key))."\":\"".$db->escape($db->escapeforlike($searchkeyinjsonformat))."%'";
 			}
 		}
 	}
 }
+//print $sql;
 if (strlen($search_email)) {
 	$sql .= natural_search('p.email', $search_email);
 }
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 65bb4fa8b08..f0646cc4161 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -618,7 +618,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -627,6 +627,13 @@ print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 print '<tr class="liste_titre_filter">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 if (!empty($arrayfields['c.ref']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" size="3" name="search_contract" value="'.dol_escape_htmltag($search_contract).'">';
@@ -723,13 +730,20 @@ if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
 if (!empty($arrayfields['status']['checked'])) {
 	print '<td class="liste_titre right" colspan="4"></td>';
 }
-print '<td class="liste_titre center">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre center">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['c.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, '', $sortfield, $sortorder);
 }
@@ -787,7 +801,9 @@ if (!empty($arrayfields['status']['checked'])) {
 	print_liste_field_titre($staticcontratligne->LibStatut(4, 3, 1, 'class="nochangebackground"'), '', '', '', '', 'width="16"');
 	print_liste_field_titre($staticcontratligne->LibStatut(5, 3, -1, 'class="nochangebackground"'), '', '', '', '', 'width="16"');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 $totalarray = array();
@@ -826,7 +842,18 @@ while ($i < min($num, $limit)) {
 
 
 	print '<tr class="oddeven">';
-
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	// Ref
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print '<td class="nowraponall">';
@@ -1002,15 +1029,17 @@ while ($i < min($num, $limit)) {
 		print '<td class="center">'.($obj->nb_closed > 0 ? $obj->nb_closed : '').'</td>';
 	}
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index f4aec2075d7..f5764c8a575 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -99,8 +99,7 @@ class box_commandes extends ModeleBoxes
 			$sql .= ", c.total_ht";
 			$sql .= ", c.total_tva";
 			$sql .= ", c.total_ttc";
-			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			$sql .= ", ".MAIN_DB_PREFIX."commande as c";
+			$sql .= " FROM ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index e34e89c97eb..6a59c6f0d56 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -99,11 +99,10 @@ class box_factures extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
-			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
-			$sql .= ")";
 			$sql .= " WHERE f.fk_soc = s.rowid";
 			$sql .= " AND f.entity IN (".getEntity('invoice').")";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 1a3344eedfe..a0ff56aa625 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -88,8 +88,7 @@ class box_propales extends ModeleBoxes
 			$sql .= ", s.code_client, s.code_compta, s.client";
 			$sql .= ", s.logo, s.email, s.entity";
 			$sql .= ", p.rowid, p.ref, p.fk_statut as status, p.datep as dp, p.datec, p.fin_validite, p.date_cloture, p.total_ht, p.total_tva, p.total_ttc, p.tms";
-			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-			$sql .= ", ".MAIN_DB_PREFIX."propal as p";
+			$sql .= " FROM ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index 2651df8b2e5..70436641fa4 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -267,7 +267,7 @@ class CMailFile
 			}
 
 			// Set atleastoneimage if there is at least one embedded file (into ->html_images)
-			if ($findimg) {
+			if ($findimg > 0) {
 				foreach ($this->html_images as $i => $val) {
 					if ($this->html_images[$i]) {
 						$this->atleastoneimage = 1;
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index b586c69d464..9bd14d120fe 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -1756,8 +1756,8 @@ abstract class CommonInvoice extends CommonObject
 		if ($this->ref_client) {
 			$complementaryinfo .= '/20/'.$this->ref_client;
 		}
-		if ($this->thirdparty->vat_number) {
-			$complementaryinfo .= '/30/'.$this->thirdparty->vat_number;
+		if ($this->thirdparty->tva_intra) {
+			$complementaryinfo .= '/30/'.$this->thirdparty->tva_intra;
 		}
 
 		// Header
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 42927d398aa..d03604dc124 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -923,6 +923,10 @@ class Conf
 				// Note: Set MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL=1 to have a renewal of token at each page call instead of each session (not recommended)
 			}
 
+			if (!isset($this->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA)) {
+				$this->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;
+			}
+
 			if (!defined('MAIN_ANTIVIRUS_BYPASS_COMMAND_AND_PARAM')) {
 				if (defined('MAIN_ANTIVIRUS_COMMAND')) {
 					$this->global->MAIN_ANTIVIRUS_COMMAND = constant('MAIN_ANTIVIRUS_COMMAND');
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index b76ad8c7a47..3b10f38d238 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -46,6 +46,7 @@
  * {dol_print_barcode}                              Print barcode
  * {dol_print_logo}                                 Print logo stored on printer. Example : <print_logo>32|32
  * {dol_print_logo_old}                             Print logo stored on printer. Must be followed by logo code. For old printers.
+ * {dol_print_logo_old_cf}                          Print logo stored on printer. Must be followed by logo code. For old printers. May help for centering image.
  * {dol_print_object_lines}                         Print object lines
  * {dol_print_object_tax}                           Print object total tax
  * {dol_print_object_local_tax}                     Print object local tax
@@ -63,7 +64,8 @@
  * <dol_value_month>                                Replaced by month number
  * <dol_value_day>                                  Replaced by day number
  * <dol_value_day_letters>                          Replaced by day number
- * <dol_value_currentdate>                          Replaced by current date
+ * <dol_value_currentdate>                          Replaced by current date and time
+ * <dol_value_currentdate_notime>                   Replaced by current date without time
  * <dol_object_id>                                  Replaced by object id
  * <dol_object_ref>                                 Replaced by object ref
  * <dol_value_customer_firstname>                   Replaced by customer firstname
@@ -191,10 +193,18 @@ class dolReceiptPrinter extends Printer
 			'dol_value_day' => 'DOL_VALUE_DAY',
 			'dol_value_day_letters' => 'DOL_VALUE_DAY',
 			'dol_value_currentdate' => 'DOL_VALUE_CURRENTDATE',
+			'dol_value_currentdate_notime' => 'CurrentDateWithTime',
+			'dol_value_currentdate_letters' => 'DOL_VALUE_CURRENTDATE_LETTERS',
+			'dol_value_currentyear' => 'CurrentYear',
+			'dol_value_currentmonth_letters' => 'DOL_VALUE_CURRENT_MONTH_LETTERS',
+			'dol_value_currentmonth' => 'DOL_VALUE_CURRENT_MONTH',
+			'dol_value_currentday' => 'DOL_VALUE_CURRENT_DAY',
+			'dol_value_currentday_letters' => 'DOL_VALUE_CURRENT_DAY',
 			'dol_print_payment' => 'DOL_PRINT_PAYMENT',
 			'dol_print_curr_date' => 'DOL_PRINT_CURR_DATE',
 			'dol_print_logo' => 'DOL_PRINT_LOGO',
 			'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
+			'dol_print_logo_old_cf' => 'DOL_PRINT_LOGO_OLD_CF',
 			'dol_value_object_id' => 'InvoiceID',
 			'dol_value_object_ref' => 'InvoiceRef',
 			'dol_print_object_lines' => 'DOL_PRINT_OBJECT_LINES',
@@ -577,9 +587,12 @@ class dolReceiptPrinter extends Printer
 	public function sendToPrinter($object, $templateid, $printerid)
 	{
 		global $conf, $mysoc, $langs, $user;
+
+		$langs->load('bills');
+
 		$error = 0;
 		$ret = $this->loadTemplate($templateid);
-
+		$now = dol_now('tzuser');
 		// tags a remplacer par leur valeur avant de parser (dol_value_xxx)
 		$this->template = str_replace('{dol_value_object_id}', $object->id, $this->template);
 		$this->template = str_replace('{dol_value_object_ref}', $object->ref, $this->template);
@@ -591,7 +604,15 @@ class dolReceiptPrinter extends Printer
 		$this->template = str_replace('{dol_value_month}', dol_print_date($object->date, '%m'), $this->template);
 		$this->template = str_replace('{dol_value_day}', dol_print_date($object->date, '%d'), $this->template);
 		$this->template = str_replace('{dol_value_day_letters}', $langs->trans("Day".dol_print_date($object->date, '%m')[1]), $this->template);
-		$this->template = str_replace('{dol_value_currentdate}', dol_print_date(dol_now(), 'dayhour'), $this->template);
+
+		$this->template = str_replace('{dol_value_currentdate}', dol_print_date($now, 'dayhour'), $this->template);
+		$this->template = str_replace('{dol_value_currentdate_notime}', dol_print_date($now, 'day'), $this->template);
+		$this->template = str_replace('{dol_value_currentdate_letters}', dol_print_date($now, 'dayhourtext'), $this->template);
+		$this->template = str_replace('{dol_value_currentyear}', dol_print_date($now, '%Y'), $this->template);
+		$this->template = str_replace('{dol_value_currentmonth_letters}', $langs->trans("Month".dol_print_date($now, '%m')), $this->template);
+		$this->template = str_replace('{dol_value_currentmonth}', dol_print_date($now, '%m'), $this->template);
+		$this->template = str_replace('{dol_value_currentday}', dol_print_date($now, '%d'), $this->template);
+		$this->template = str_replace('{dol_value_currentday_letters}', $langs->trans("Day".dol_print_date($now, '%m')[1]), $this->template);
 
 		$this->template = str_replace('{dol_value_customer_firstname}', $object->thirdparty->firstname, $this->template);
 		$this->template = str_replace('{dol_value_customer_lastname}', $object->thirdparty->lastname, $this->template);
@@ -759,6 +780,10 @@ class dolReceiptPrinter extends Printer
 						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
 						$this->printer->bitImage($img);
 						break;
+					case 'DOL_PRINT_LOGO_OLD_CF':
+						$img = EscposImage::load(DOL_DATA_ROOT.'/mycompany/logos/'.$mysoc->logo);
+						$this->printer->bitImageColumnFormat($img);
+						break;
 					case 'DOL_PRINT_QRCODE':
 						// $vals[$tplline]['value'] -> qrCode($content, $ec, $size, $model)
 						$this->printer->qrcode($vals[$tplline]['value']);
@@ -845,9 +870,9 @@ class dolReceiptPrinter extends Printer
 						}
 						break;
 					case 'DOL_VALUE_PLACE':
-							$sql = "SELECT floor, label FROM ".$this->db->prefix()."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
-							$resql = $this->db->query($sql);
-							$obj = $this->db->fetch_object($resql);
+						$sql = "SELECT floor, label FROM ".$this->db->prefix()."takepos_floor_tables where rowid=".((int) str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $object->ref)));
+						$resql = $this->db->query($sql);
+						$obj = $this->db->fetch_object($resql);
 						if ($obj) {
 							$this->printer->text($obj->label);
 						}
diff --git a/htdocs/core/class/html.formsms.class.php b/htdocs/core/class/html.formsms.class.php
index 68b8410e647..f08640c6e55 100644
--- a/htdocs/core/class/html.formsms.class.php
+++ b/htdocs/core/class/html.formsms.class.php
@@ -285,7 +285,7 @@ function limitChars(textarea, limit, infodiv)
 				print '<input type="hidden" name="message" value="'.dol_escape_htmltag($defaultmessage).'">';
 			} else {
 				print '<textarea class="quatrevingtpercent" name="message" id="message" rows="'.ROWS_4.'" onkeyup="limitChars(this, 160, \'charlimitinfospan\')">'.$defaultmessage.'</textarea>';
-				print '<div id="charlimitinfo">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
+				print '<div id="charlimitinfo" class="opacitymedium">'.$langs->trans("SmsInfoCharRemain").': <span id="charlimitinfospan">'.(160 - dol_strlen($defaultmessage)).'</span></div></td>';
 			}
 			print "</td></tr>\n";
 		}
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 0f00bbf770d..f2a185e534d 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -334,7 +334,7 @@ class FormTicket
 		print '</td></tr>';
 
 		// Severity => Priority
-		print '<tr><td><span class="none"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
+		print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
 		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 1);
 		print '</td></tr>';
 
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index ab64d0c052a..521d5ee2092 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -203,9 +203,10 @@ class Utils
 	 *  @param  string      $file              'auto' or filename to build
 	 *  @param  int         $keeplastnfiles    Keep only last n files (not used yet)
 	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec' - need size of dump in memory, but low memory method is used if GETPOST('lowmemorydump') is set, 2=Use the 'popen' method (low memory method)
+	 *  @param	int			$lowmemorydump	   1=Use the low memory method. If $lowmemorydump is set, it means we want to make the compression using an external pipe instead retreiving the content of the dump in PHP memory array $output_arr and then print it into the PHP pipe open with xopen().
 	 *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	public function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0)
+	public function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0, $lowmemorydump = 0)
 	{
 		global $db, $conf, $langs, $dolibarr_main_data_root;
 		global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
@@ -358,10 +359,6 @@ class Utils
 
 			$handle = '';
 
-			// If $lowmemorydump is set, it means we want to make the compression using an external pipe instead retreiving the
-			// content of the dump in PHP memory array $output_arr and then print it into the PHP pipe open with xopen().
-			$lowmemorydump = GETPOSTISSET("lowmemorydump") ? GETPOST("lowmemorydump") : getDolGlobalString('MAIN_LOW_MEMORY_DUMP');
-
 			// Start call method to execute dump
 			$fullcommandcrypted = $command." ".$paramcrypted." 2>&1";
 			$fullcommandclear = $command." ".$paramclear." 2>&1";
@@ -377,23 +374,23 @@ class Utils
 				}
 			} else {
 				if ($compression == 'none') {
-					$fullcommandclear .= ' > "'.dol_sanitizePathName($outputfile).'"';
-					$fullcommandcrypted .= ' > "'.dol_sanitizePathName($outputfile).'"';
+					$fullcommandclear .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." > "'.dol_sanitizePathName($outputfile).'"';
+					$fullcommandcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." > "'.dol_sanitizePathName($outputfile).'"';
 					$handle = 1;
 				} elseif ($compression == 'gz') {
-					$fullcommandclear .= ' | gzip > "'.dol_sanitizePathName($outputfile).'"';
-					$fullcommandcrypted .= ' | gzip > "'.dol_sanitizePathName($outputfile).'"';
-					$paramcrypted .= ' | gzip';
+					$fullcommandclear .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | gzip > "'.dol_sanitizePathName($outputfile).'"';
+					$fullcommandcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | gzip > "'.dol_sanitizePathName($outputfile).'"';
+					$paramcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | gzip';
 					$handle = 1;
 				} elseif ($compression == 'bz') {
-					$fullcommandclear .= ' | bzip2 > "'.dol_sanitizePathName($outputfile).'"';
-					$fullcommandcrypted .= ' | bzip2 > "'.dol_sanitizePathName($outputfile).'"';
-					$paramcrypted .= ' | bzip2';
+					$fullcommandclear .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | bzip2 > "'.dol_sanitizePathName($outputfile).'"';
+					$fullcommandcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | bzip2 > "'.dol_sanitizePathName($outputfile).'"';
+					$paramcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | bzip2';
 					$handle = 1;
 				} elseif ($compression == 'zstd') {
-					$fullcommandclear .= ' | zstd > "'.dol_sanitizePathName($outputfile).'"';
-					$fullcommandcrypted .= ' | zstd > "'.dol_sanitizePathName($outputfile).'"';
-					$paramcrypted .= ' | zstd';
+					$fullcommandclear .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | zstd > "'.dol_sanitizePathName($outputfile).'"';
+					$fullcommandcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | zstd > "'.dol_sanitizePathName($outputfile).'"';
+					$paramcrypted .= ' | grep -v "Warning: Using a password on the command line interface can be insecure." | zstd';
 					$handle = 1;
 				}
 			}
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 13962463531..1462f385aae 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -401,8 +401,8 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 /**
  * Fast compare of 2 files identified by their properties ->name, ->date and ->size
  *
- * @param	string 	$a		File 1
- * @param 	string	$b		File 2
+ * @param	object 	$a		File 1
+ * @param 	object	$b		File 2
  * @return 	int				1, 0, 1
  */
 function dol_compare_file($a, $b)
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 4b43230adda..c258e3198ce 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -936,7 +936,7 @@ function getSocialNetworkSharingLinks()
  * @param	string		$langcode			Language code ('' or 'en', 'fr', 'es', ...)
  * @param	array		$otherfilters		Other filters
  * @param	int			$status				0 or 1, or -1 for both
- * @return  string							HTML content
+ * @return  array							Array with results of search
  */
 function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC', $langcode = '', $otherfilters = 'null', $status = 1)
 {
@@ -974,6 +974,8 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 	$found = 0;
 
 	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/meta/', $algo) || preg_match('/content/', $algo))) {
+		include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+
 		$sql = 'SELECT wp.rowid FROM '.MAIN_DB_PREFIX.'website_page as wp';
 		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
 			$sql .= ', '.MAIN_DB_PREFIX.'categorie_website_page as cwp';
@@ -983,7 +985,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 			$sql .= " AND wp.status = ".((int) $status);
 		}
 		if ($langcode) {
-			$sql .= " AND wp.lang ='".$db->escape($langcode)."'";
+			$sql .= " AND wp.lang = '".$db->escape($langcode)."'";
 		}
 		if ($type) {
 			$tmparrayoftype = explode(',', $type);
@@ -996,11 +998,11 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		$sql .= " AND (";
 		$searchalgo = '';
 		if (preg_match('/meta/', $algo)) {
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escapeforlike($db->escape($searchstring))."%' OR wp.description LIKE '%".$db->escapeforlike($db->escape($searchstring))."%'";
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escapeforlike($db->escape($searchstring)).",%' OR wp.keywords LIKE '% ".$db->escapeforlike($db->escape($searchstring))."%'"; // TODO Use a better way to scan keywords
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.title LIKE '%".$db->escape($db->escapeforlike($searchstring))."%' OR wp.description LIKE '%".$db->escape($db->escapeforlike($searchstring))."%'";
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.keywords LIKE '".$db->escape($db->escapeforlike($searchstring)).",%' OR wp.keywords LIKE '% ".$db->escape($db->escapeforlike($searchstring))."%'"; // TODO Use a better way to scan keywords
 		}
 		if (preg_match('/content/', $algo)) {
-			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escapeforlike($db->escape($searchstring))."%'";
+			$searchalgo .= ($searchalgo ? ' OR ' : '')."wp.content LIKE '%".$db->escape($db->escapeforlike($searchstring))."%'";
 		}
 		$sql .= $searchalgo;
 		if (is_array($otherfilters) && !empty($otherfilters['category'])) {
@@ -1012,6 +1014,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 		//print $sql;
 
 		$resql = $db->query($sql);
+
 		if ($resql) {
 			$i = 0;
 			while (($obj = $db->fetch_object($resql)) && ($i < $max || $max == 0)) {
diff --git a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
index b11e2a7e563..8be86dda944 100644
--- a/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -173,7 +173,9 @@ class doc_generic_asset_odt extends ModelePDFAsset
 		if ($nbofiles) {
 			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=asset_asset/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=asset_asset/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=ASSET_ASSET_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
index 2dcf5512dc1..bec28b941aa 100644
--- a/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
+++ b/htdocs/core/modules/bom/doc/doc_generic_bom_odt.modules.php
@@ -169,7 +169,9 @@ class doc_generic_bom_odt extends ModelePDFBom
 			$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=boms/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=boms/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=BOM_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 9239ec0ed4b..5e94397bc91 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -159,7 +159,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$texte .= $conf->global->COMMANDE_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.dol_escape_htmltag($langs->trans("Modify")).'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -176,7 +176,9 @@ class doc_generic_order_odt extends ModelePDFCommandes
 			$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=orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMMANDE_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
index 222286d5592..dad1ebc9122 100644
--- a/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
+++ b/htdocs/core/modules/contract/doc/doc_generic_contract_odt.modules.php
@@ -51,8 +51,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 	public $phpmin = array(7, 0);
 
 	/**
-	 * Dolibarr version of the loaded document
-	 * @var string
+	 * @var string Dolibarr version of the loaded document
 	 */
 	public $version = 'dolibarr';
 
@@ -94,7 +93,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -123,7 +122,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="CONTRACT_ADDON_PDF_ODT_PATH">';
-		$texte .= '<table class="nobordernopadding" width="100%">';
+		$texte .= '<table class="nobordernopadding centpercent">';
 
 		// List of directories area
 		$texte .= '<tr><td>';
@@ -161,10 +160,25 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$texte .= '<br></div></div>';
 
 		// Scan directories
-		if (count($listofdir)) {
-			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->CONTRACT_ADDON_PDF_ODT_PATH)) {
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
+			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+			$texte .= count($listoffiles);
+			//$texte.=$nbofiles?'</a>':'';
+			$texte .= '</b>';
 		}
 
+		if ($nbofiles) {
+			$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=contracts/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=CONTRACT_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
+			}
+			$texte .= '</div>';
+		}
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
 		$maxfilesizearray = getMaxFileSizeArray();
@@ -228,7 +242,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
-		// Load traductions files required by page
+		// Load translation files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
 		if ($conf->contrat->multidir_output[$object->entity]) {
@@ -382,16 +396,21 @@ class doc_generic_contract_odt extends ModelePDFContract
 					dol_syslog($e->getMessage(), LOG_INFO);
 				}
 
+				// 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
+
 				foreach ($tmparray as $key => $value) {
 					try {
-						if (preg_match('/logo$/', $key)) { // Image
+						if (preg_match('/logo$/', $key)) {
+							// Image
 							if (file_exists($value)) {
 								$odfHandler->setImage($key, $value);
 							} else {
 								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
 							}
-						} else // Text
-						{
+						} else {
+							// Text
 							$odfHandler->setVars($key, $value, true, 'UTF-8');
 						}
 					} catch (OdfException $e) {
@@ -448,7 +467,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				}
 
 				// Call the beforeODTSave hook
-				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				// Write new file
@@ -457,6 +476,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 						$odfHandler->exportAsAttachedPDF($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				} else {
@@ -464,10 +484,12 @@ class doc_generic_contract_odt extends ModelePDFContract
 						$odfHandler->saveToDisk($file);
 					} catch (Exception $e) {
 						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
 						return -1;
 					}
 				}
 
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
 				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
 				if (!empty($conf->global->MAIN_UMASK)) {
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index cfb23269ca9..73793c5a757 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -175,7 +175,9 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 			$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=shipments/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=shipments/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=EXPEDITION_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
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 061f18e5442..0b8fa2d4621 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
@@ -174,7 +174,9 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 			$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=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=FACTURE_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 09f93a436ea..22c12024c2b 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -862,8 +862,8 @@ class ImportCsv extends ModeleImports
 										$stringtosearch = json_encode($socialnetwork).':'.json_encode($json->$socialnetwork);
 										//var_dump($stringtosearch);
 										//var_dump($this->db->escape($stringtosearch));	// This provide a value for sql string (but not for a like)
-										$where[] = $key." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
-										$filters[] = $col." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
+										$where[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
+										$filters[] = $col." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
 										//var_dump($where[1]); // This provide a value for sql string inside a like
 									} else {
 										$where[] = $key.' = '.$data[$key];
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index ecf7d8b4a77..35adc4476a0 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -908,8 +908,8 @@ class ImportXlsx extends ModeleImports
 										$stringtosearch = json_encode($socialnetwork).':'.json_encode($json->$socialnetwork);
 										//var_dump($stringtosearch);
 										//var_dump($this->db->escape($stringtosearch));	// This provide a value for sql string (but not for a like)
-										$where[] = $key." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
-										$filters[] = $col." LIKE '%".$this->db->escapeforlike($this->db->escape($stringtosearch))."%'";
+										$where[] = $key." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
+										$filters[] = $col." LIKE '%".$this->db->escape($this->db->escapeforlike($stringtosearch))."%'";
 										//var_dump($where[1]); // This provide a value for sql string inside a like
 									} else {
 										$where[] = $key.' = '.$data[$key];
diff --git a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
index 2ab951147b9..ed48c93c4de 100644
--- a/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
+++ b/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php
@@ -164,7 +164,9 @@ class doc_generic_member_odt extends ModelePDFMember
 			$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=members/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=members/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=MEMBER_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/modBlockedLog.class.php b/htdocs/core/modules/modBlockedLog.class.php
index 0a07fff6aaf..830f9f0f8b1 100644
--- a/htdocs/core/modules/modBlockedLog.class.php
+++ b/htdocs/core/modules/modBlockedLog.class.php
@@ -183,7 +183,7 @@ class modBlockedLog extends DolibarrModules
 		$result = $b->setObjectData($object, 'MODULE_SET', 0);
 		if ($result < 0) {
 			$this->error = $b->error;
-			$this->errors = $b->erros;
+			$this->errors = $b->errors;
 			return 0;
 		}
 
@@ -226,7 +226,7 @@ class modBlockedLog extends DolibarrModules
 		$result = $b->setObjectData($object, 'MODULE_RESET', 0);
 		if ($result < 0) {
 			$this->error = $b->error;
-			$this->errors = $b->erros;
+			$this->errors = $b->errors;
 			return 0;
 		}
 
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 992015fe75e..93b243625f4 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -99,7 +99,7 @@ class modCron extends DolibarrModules
 		// Cronjobs
 		$this->cronjobs = array(
 			0=>array('entity'=>0, 'label'=>'PurgeDeleteTemporaryFilesShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'purgeFiles', 'parameters'=>'tempfilesold+logfiles', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>2, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>50, 'status'=>1, 'test'=>true),
-			1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>'in_array($conf->db->type, array(\'mysql\', \'mysqli\'))'),
+			1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10,0,0', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>'in_array($conf->db->type, array(\'mysql\', \'mysqli\'))'),
 			2=>array('entity'=>0, 'label'=>'MakeSendLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'sendBackup', 'parameters'=>',,,,,sql', 'comment'=>'MakeSendLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>604800, 'priority'=>91, 'status'=>0, 'test'=>'!empty($conf->global->MAIN_ALLOW_BACKUP_BY_EMAIL) && in_array($conf->db->type, array(\'mysql\', \'mysqli\'))'),
 			3=>array('entity'=>0, 'label'=>'CleanUnfinishedCronjobShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'cleanUnfinishedCronjob', 'parameters'=>'', 'comment'=>'CleanUnfinishedCronjob', 'frequency'=>5, 'unitfrequency'=>60, 'priority'=>10, 'status'=>0, 'test'=>'getDolGlobalInt("MAIN_FEATURES_LEVEL") >= 2'),
 			// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
diff --git a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
index 42b3c529fe4..b89c4eab2cd 100644
--- a/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
+++ b/htdocs/core/modules/mrp/doc/doc_generic_mo_odt.modules.php
@@ -175,7 +175,9 @@ class doc_generic_mo_odt extends ModelePDFMo
 			$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=mrps/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mrps/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=MRP_MO_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 4e8be5f6389..2015da21f61 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -468,7 +468,9 @@ class doc_generic_project_odt extends ModelePDFProjects
 			$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=projects/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=projects/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=PROJECT_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index ba386eedfe7..a7f3eab4a30 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -433,7 +433,9 @@ class doc_generic_task_odt extends ModelePDFTask
 			$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=tasks/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=tasks/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=PROJECT_TASK_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
index 4d8edca7f64..4ebc742b4bb 100644
--- a/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
+++ b/htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php
@@ -168,7 +168,9 @@ class doc_generic_reception_odt extends ModelePdfReception
 			$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=receptions/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=receptions/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=RECEPTION_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
index 0f5adc3fc7d..eb6ba838d7a 100644
--- a/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
+++ b/htdocs/core/modules/stock/doc/doc_generic_stock_odt.modules.php
@@ -172,7 +172,9 @@ class doc_generic_stock_odt extends ModelePDFStock
 			$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=stocks/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=stocks/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=STOCK_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index f3177233589..12bbcc12edc 100644
--- a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
@@ -163,7 +163,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 		// Scan directories
 		$nbofiles = count($listoffiles);
-		if (!empty($conf->global->COMMANDE_ADDON_PDF_ODT_PATH)) {
+		if (!empty($conf->global->SUPPLIER_ORDER_ADDON_PDF_ODT_PATH)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
 			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
 			$texte .= count($listoffiles);
@@ -175,7 +175,9 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 			$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=supplier_orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=supplier_orders/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=SUPPLIER_ORDER_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
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 5e4b75a183e..7ff463df8b3 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2010-2014 Juanjo Menent         <jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García         <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet         <fmarcet@2byte.es>
- * Copyright (C) 2018      Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022 Frédéric France       <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1567,7 +1567,7 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 			'border-left' => false, // remove left line separator
 		);
 
-		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE)) {
+		if (!empty($conf->global->MAIN_GENERATE_SUPPLIER_ORDER_WITH_PICTURE)) {
 			$this->cols['photo']['status'] = true;
 		}
 
diff --git a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
index fc75445123a..55a7710c5a4 100644
--- a/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/doc_generic_supplier_proposal_odt.modules.php
@@ -179,7 +179,9 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 			$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=supplier_proposal/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=supplier_proposal/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 
diff --git a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
index ff6359be5ce..1a2d1e537cc 100644
--- a/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
+++ b/htdocs/core/modules/ticket/doc/doc_generic_ticket_odt.modules.php
@@ -161,7 +161,9 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 			$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=tickets/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=tickets/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=TICKET_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
index d129c80f126..1c3e346203b 100644
--- a/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
+++ b/htdocs/core/modules/user/doc/doc_generic_user_odt.modules.php
@@ -192,7 +192,9 @@ class doc_generic_user_odt extends ModelePDFUser
 			$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=users/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=users/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=USER_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index d3981dcf264..4842a27fa77 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -84,6 +84,13 @@ class Expedition extends CommonObject
 	 */
 	public $picto = 'dolly';
 
+
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array();
+
+
 	public $socid;
 
 	/**
diff --git a/htdocs/expedition/class/expeditionstats.class.php b/htdocs/expedition/class/expeditionstats.class.php
index 8eb31896f38..aa4e40fcb8f 100644
--- a/htdocs/expedition/class/expeditionstats.class.php
+++ b/htdocs/expedition/class/expeditionstats.class.php
@@ -131,6 +131,54 @@ class ExpeditionStats extends Stats
 		return $this->_getNbByYear($sql);
 	}
 
+	/**
+	 * Return the orders amount by month for a year
+	 *
+	 * @param	int		$year		Year to scan
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return	array				Array with amount by month
+	 */
+	public function getAmountByMonth($year, $format = 0)
+	{
+		global $user;
+
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, SUM(c.".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= $this->join;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		$res = $this->_getAmountByMonth($year, $sql, $format);
+		return $res;
+	}
+
+	/**
+	 * Return the orders amount average by month for a year
+	 *
+	 * @param	int		$year	year for stats
+	 * @return	array			array with number by month
+	 */
+	public function getAverageByMonth($year)
+	{
+		global $user;
+
+		$sql = "SELECT date_format(c.date_valid,'%m') as dm, AVG(c.".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		if (empty($user->rights->societe->client->voir) && !$this->socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= $this->join;
+		$sql .= " WHERE ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		return $this->_getAverageByMonth($year, $sql);
+	}
+
 	/**
 	 *	Return nb, total and average
 	 *
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 34842efaaf3..398bc381715 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -47,11 +47,12 @@ $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
 $mesg = '';
+$mode = '';
 
 print load_fiche_titre($langs->trans("StatisticsOfSendings").' '.$year, $mesg);
 
-$stats = new ExpeditionStats($db);
-$data = $stats->getNbExpeditionByMonth($year);
+$stats = new ExpeditionStats($db, $socid, $mode);
+$data = $stats->getNbByMonth($year);
 
 dol_mkdir($conf->expedition->dir_temp);
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 896bb29cf43..f1e6cf355db 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -532,7 +532,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">';
@@ -540,6 +540,13 @@ if ($resql) {
 
 	// Filters
 	print '<tr class="liste_titre_filter">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
 	if (!empty($arrayfields['d.ref']['checked'])) {
 		print '<td class="liste_titre" align="left">';
 		print '<input class="flat" size="15" type="text" name="search_ref" value="'.$search_ref.'">';
@@ -626,14 +633,19 @@ if ($resql) {
 		print '</td>';
 	}
 	// Action column
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	}
 	if (!empty($arrayfields['d.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['d.ref']['label'], $_SERVER["PHP_SELF"], "d.ref", "", $param, '', $sortfield, $sortorder);
 	}
@@ -676,7 +688,9 @@ if ($resql) {
 	if (!empty($arrayfields['d.fk_statut']['checked'])) {
 		print_liste_field_titre($arrayfields['d.fk_statut']['label'], $_SERVER["PHP_SELF"], "d.fk_statut", "", $param, 'align="right"', $sortfield, $sortorder);
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	}
 	print "</tr>\n";
 
 	$total_total_ht = 0;
@@ -712,6 +726,18 @@ if ($resql) {
 
 
 			print '<tr class="oddeven">';
+			// Action column
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+			}
 			// Ref
 			if (!empty($arrayfields['d.ref']['checked'])) {
 				print '<td>';
@@ -856,15 +882,17 @@ if ($resql) {
 				}
 			}
 			// Action column
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				print '</td>';
 			}
-			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 174196a23a5..587089c2d35 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -493,7 +493,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
@@ -503,7 +503,7 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
 // Action column
-if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons('left');
 	print $searchpicto;
@@ -588,7 +588,7 @@ if (!empty($arrayfields['fd.duree']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 // Action column
-if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
@@ -602,6 +602,10 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['f.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
 }
@@ -650,7 +654,11 @@ if (!empty($arrayfields['fd.date']['checked'])) {
 if (!empty($arrayfields['fd.duree']['checked'])) {
 	print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, '', $sortfield, $sortorder, 'right ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+
+// Action column
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 
@@ -687,7 +695,18 @@ while ($i < $imaxinloop) {
 	$companystatic->status = $obj->thirdpartystatus;
 
 	print '<tr class="oddeven">';
-
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	if (!empty($arrayfields['f.ref']['checked'])) {
 		print "<td>";
 
@@ -848,7 +867,7 @@ while ($i < $imaxinloop) {
 		$totalarray['val']['fd.duree'] += $obj->duree;
 	}
 	// Action column
-	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
 		print '<td class="nowrap center">';
 		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 			$selected = 0;
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 2c929aa40ba..f3260d8ea48 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -106,7 +106,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
-	// terms of the settlement
+	// Set payment terms of the settlement
 	if ($action == 'setconditions' && $user->rights->societe->creer) {
 		$object->fetch($id);
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_supplier_id', 'int'));
@@ -114,7 +114,7 @@ if (empty($reshook)) {
 			dol_print_error($db, $object->error);
 		}
 	}
-	// mode de reglement
+	// Payment mode
 	if ($action == 'setmode' && $user->rights->societe->creer) {
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_supplier_id', 'int'));
@@ -123,6 +123,15 @@ if (empty($reshook)) {
 		}
 	}
 
+	// Bank account
+	if ($action == 'setbankaccount' && $user->rights->societe->creer) {
+		$object->fetch($id);
+		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
+
 	// update supplier order min amount
 	if ($action == 'setsupplier_order_min_amount') {
 		$object->fetch($id);
@@ -276,7 +285,7 @@ if ($object->id > 0) {
 	print "</td>";
 	print '</tr>';
 
-	// Mode de reglement par defaut
+	// Default payment mode
 	print '<tr><td class="nowrap">';
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
 	print $langs->trans('PaymentMode');
@@ -294,6 +303,26 @@ if ($object->id > 0) {
 	print "</td>";
 	print '</tr>';
 
+	if (isModEnabled("banque")) {
+		// Default bank account for payments
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('PaymentBankAccount');
+		print '<td>';
+		if (($action != 'editbankaccount') && $user->rights->societe->creer) {
+			print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editbankaccount&token='.newToken().'&socid='.$object->id.'">'.img_edit($langs->trans('SetBankAccount'), 1).'</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editbankaccount') {
+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'fk_account', 1);
+		} else {
+			$form->formSelectAccount($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_account, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+	}
+
 	// Relative discounts (Discounts-Drawbacks-Rebates)
 	print '<tr><td class="nowrap">';
 	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 8eac9943c3a..1a39a8cf378 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -1283,7 +1283,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 	if (GETPOST('autoselectall', 'int')) {
@@ -1300,6 +1300,13 @@ if ($resql) {
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre middle">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
 	// Ref
 	if (!empty($arrayfields['cf.ref']['checked'])) {
 		print '<td class="liste_titre"><input size="8" type="text" class="flat maxwidth75" name="search_ref" value="'.$search_ref.'"></td>';
@@ -1484,15 +1491,20 @@ if ($resql) {
 		print '</td>';
 	}
 	// Action column
-	print '<td class="liste_titre middle">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre middle">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 
 	print "</tr>\n";
 
 	// Fields title
 	print '<tr class="liste_titre">';
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	}
 	if (!empty($arrayfields['cf.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['cf.ref']['label'], $_SERVER["PHP_SELF"], "cf.ref", "", $param, '', $sortfield, $sortorder);
 	}
@@ -1589,7 +1601,9 @@ if ($resql) {
 	if (!empty($arrayfields['cf.note_private']['checked'])) {
 		print_liste_field_titre($arrayfields['cf.note_private']['label'], $_SERVER["PHP_SELF"], "cf.note_private", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	}
 	print "</tr>\n";
 
 
@@ -1632,7 +1646,18 @@ if ($resql) {
 		$objectstatic->statut = $obj->fk_statut;
 
 		print '<tr class="oddeven">';
-
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
 		// Ref
 		if (!empty($arrayfields['cf.ref']['checked'])) {
 			print '<td class="nowrap">';
@@ -1939,15 +1964,17 @@ if ($resql) {
 		}
 
 		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0d8945436e2..0f7a2660bf8 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -972,7 +972,7 @@ if ($moreforfilter) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -982,6 +982,13 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 
 // Line for filters
 print '<tr class="liste_titre_filter">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre middle">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 // Ref
 if (!empty($arrayfields['f.ref']['checked'])) {
 	print '<td class="liste_titre left">';
@@ -1202,14 +1209,19 @@ if (!empty($arrayfields['f.fk_statut']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre middle">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre middle">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['f.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER['PHP_SELF'], 'f.ref,f.rowid', '', $param, '', $sortfield, $sortorder);
 }
@@ -1321,7 +1333,9 @@ if (!empty($arrayfields['f.tms']['checked'])) {
 if (!empty($arrayfields['f.fk_statut']['checked'])) {
 	print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "fk_statut,paye,type", "", $param, '', $sortfield, $sortorder, 'right ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 $facturestatic = new FactureFournisseur($db);
@@ -1395,6 +1409,18 @@ if ($num > 0) {
 		}
 
 		print '<tr class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->facid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
 		if (!empty($arrayfields['f.ref']['checked'])) {
 			print '<td class="nowraponall">';
 
@@ -1767,15 +1793,17 @@ if ($num > 0) {
 		}
 
 		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->facid, $arrayofselected)) {
-				$selected = 1;
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->facid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$obj->facid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->facid.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index fcdb252c43e..0a8f7a5c760 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2013		Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2014-2017  Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2020-2021  Udo Tamm            <dev@dolibit.de>
  * Copyright (C) 2022		Anthony Berton      <anthony.berton@bb2a.fr>
  *
@@ -261,6 +261,12 @@ if (empty($reshook)) {
 				$error++;
 			}
 
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
+			if ($ret < 0) {
+				$error++;
+			}
+
 			$result = 0;
 
 			if (!$error) {
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index ddbafbcbd3c..85cc0961363 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2013-2020 Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2012-2016 Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2018      Charlene Benke	<charlie@patas-monkey.com>
- * Copyright (C) 2019-2021 Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2022 Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -540,7 +540,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 
@@ -555,7 +555,13 @@ if ($resql) {
 
 	// Filters
 	print '<tr class="liste_titre_filter">';
-
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
 	if (!empty($arrayfields['cp.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
@@ -681,14 +687,19 @@ if ($resql) {
 	}
 
 	// Action column
-	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre maxwidthsearch">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
 	if (!empty($arrayfields['cp.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['cp.ref']['label'], $_SERVER["PHP_SELF"], "cp.ref", "", $param, '', $sortfield, $sortorder);
 	}
@@ -731,7 +742,9 @@ if ($resql) {
 	if (!empty($arrayfields['cp.statut']['checked'])) {
 		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
 	print "</tr>\n";
 
 	$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
@@ -789,7 +802,18 @@ if ($resql) {
 			$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
 			print '<tr class="oddeven">';
-
+			// Action column
+			if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+			}
 			if (!empty($arrayfields['cp.ref']['checked'])) {
 				print '<td class="nowraponall">';
 				print $holidaystatic->getNomUrl(1, 1);
@@ -893,15 +917,17 @@ if ($resql) {
 			}
 
 			// Action column
-			print '<td class="nowrap center">';
-			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->rowid, $arrayofselected)) {
-					$selected = 1;
+			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+				print '<td class="nowrap center">';
+				if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->rowid, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 				}
-				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+				print '</td>';
 			}
-			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -923,6 +949,8 @@ if ($resql) {
 					}
 				}
 			}
+			// status
+			print '<td></td>';
 			print '</tr>';
 		}
 	}
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index c5dbf6b0eac..9a33bd25c05 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -492,7 +492,8 @@ if ($step == 2 && $datatoimport) {
 		$text = $objmodelimport->getDriverDescForKey($key);
 		print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
 		print '<td style="text-align:center">';
-		print '<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank" rel="noopener noreferrer">';
+		$filename = $langs->trans("ExampleOfImportFile").'_'.$datatoimport.'.'.$key;
+		print '<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'&output=file&file='.urlencode($filename).'" target="_blank" rel="noopener noreferrer">';
 		print img_picto('', 'download', 'class="paddingright opacitymedium"');
 		print $langs->trans("DownloadEmptyExampleShort");
 		print '</a>';
@@ -583,7 +584,8 @@ if ($step == 3 && $datatoimport) {
 	$text = $objmodelimport->getDriverDescForKey($format);
 	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td><td style="text-align:right" class="nowrap">';
-	print '<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank" rel="noopener noreferrer">';
+	$filename = $langs->trans("ExampleOfImportFile").'_'.$datatoimport.'.'.$format;
+	print '<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'&output=file&file='.urlencode($filename).'" target="_blank" rel="noopener noreferrer">';
 	print img_picto('', 'download', 'class="paddingright opacitymedium"');
 	print $langs->trans("DownloadEmptyExampleShort");
 	print '</a>';
@@ -1066,6 +1068,7 @@ if ($step == 4 && $datatoimport) {
 	print '<div id="left" class="connectedSortable">'."\n";
 
 	// List of source fields
+
 	$var = false;
 	$lefti = 1;
 	foreach ($fieldssource as $key => $val) {
@@ -1088,6 +1091,7 @@ if ($step == 4 && $datatoimport) {
 	print '</td><td width="50%" class="nopaddingrightimp">';
 
 	// Set the list of all possible target fields in Dolibarr.
+
 	$optionsall = array();
 	foreach ($fieldstarget as $code => $line) {
 		//var_dump($line);
@@ -1139,8 +1143,7 @@ if ($step == 4 && $datatoimport) {
 		$entityicon = !empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity; // $entityicon must string name of picto of the field like 'project', 'company', 'contact', 'modulename', ...
 		$entitylang = $entitytolang[$entity] ? $entitytolang[$entity] : $objimport->array_import_label[0]; // $entitylang must be a translation key to describe object the field is related to, like 'Company', 'Contact', 'MyModyle', ...
 
-		//print '<td class="nowraponall" style="font-weight: normal">=> '.img_object('', $entityicon).' '.$langs->trans($entitylang).'</td>';
-		print '<td class="nowraponall" style="font-weight: normal">=> </td>';
+		print '<td class="nowraponall hideonsmartphone" style="font-weight: normal">=> </td>';
 		print '<td class="nowraponall" style="font-weight: normal">';
 
 		//var_dump($_SESSION['dol_array_match_file_to_database_select']);
@@ -1508,7 +1511,7 @@ if ($step == 4 && $datatoimport) {
 				print '<tr class="oddeven"><td>';
 				print $obj->label;
 				print '</td>';
-				print '<td>';
+				print '<td class="tdoverflowmax150">';
 				if (empty($obj->fk_user)) {
 					print $langs->trans("Everybody");
 				} else {
@@ -2336,7 +2339,7 @@ $db->close();
  */
 function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 {
-	global $langs;
+	global $conf, $langs;
 
 	$height = '32px';
 
@@ -2382,7 +2385,7 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		if (isset($fieldssource[$pos]['imported']) && $fieldssource[$pos]['imported'] == false) {
 			print '<td class="nowraponall boxtdunused" style="font-weight: normal">';
 		} else {
-			print '<td class="nowraponall" style="font-weight: normal">';
+			print '<td class="nowraponall tdoverflowmax500" style="font-weight: normal">';
 		}
 		print $langs->trans("Column").' '.num2Alpha($pos - 1).' (#'.$pos.')';
 		if (empty($fieldssource[$pos]['example1'])) {
@@ -2394,7 +2397,12 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 			if (!utf8_check($example)) {
 				$example = utf8_encode($example);
 			}
-			print ' - ';
+			if (!empty($conf->dol_optimize_smallscreen)) {
+				//print '<br>';
+				print ' - ';
+			} else {
+				print ' - ';
+			}
 			//print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ExampleOnFirstLine").': </span>';
 			print '<i class="opacitymedium">'.$example.'</i>';
 		}
diff --git a/htdocs/includes/adodbtime/README.txt b/htdocs/includes/adodbtime/README.txt
deleted file mode 100644
index 3e2969a2868..00000000000
--- a/htdocs/includes/adodbtime/README.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-README
-======
-
-ADOdb Date Library, part of the ADOdb abstraction library 
-
-See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index 
-Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php 
diff --git a/htdocs/includes/adodbtime/adodb-time.inc.php b/htdocs/includes/adodbtime/adodb-time.inc.php
deleted file mode 100644
index 1dfa97929a2..00000000000
--- a/htdocs/includes/adodbtime/adodb-time.inc.php
+++ /dev/null
@@ -1,1459 +0,0 @@
-<?php
-/**
-ADOdb Date Library, part of the ADOdb abstraction library
-See Wiki: https://adodb.org/dokuwiki/doku.php?id=v5:datetime:datetime_index
-Download: https://github.com/ADOdb/ADOdb/blob/master/adodb-time.inc.php
-
-PHP native date functions use integer timestamps for computations.
-Because of this, dates are restricted to the years 1901-2038 on Unix
-and 1970-2038 on Windows due to integer overflow for dates beyond
-those years. This library overcomes these limitations by replacing the
-native function's signed integers (normally 32-bits) with PHP floating
-point numbers (normally 64-bits).
-
-Dates from 100 A.D. to 3000 A.D. and later
-have been tested. The minimum is 100 A.D. as <100 will invoke the
-2 => 4 digit year conversion. The maximum is billions of years in the
-future, but this is a theoretical limit as the computation of that year
-would take too long with the current implementation of adodb_mktime().
-
-This library replaces native functions as follows:
-
-<pre>
-	getdate()  with  adodb_getdate()
-	date()     with  adodb_date()
-	gmdate()   with  adodb_gmdate()
-	mktime()   with  adodb_mktime()
-	gmmktime() with  adodb_gmmktime()
-	strftime() with  adodb_strftime()
-	strftime() with  adodb_gmstrftime()
-</pre>
-
-The parameters are identical, except that adodb_date() accepts a subset
-of date()'s field formats. Mktime() will convert from local time to GMT,
-and date() will convert from GMT to local time, but daylight savings is
-not handled currently.
-
-This library is independant of the rest of ADOdb, and can be used
-as standalone code.
-
-PERFORMANCE
-
-For high speed, this library uses the native date functions where
-possible, and only switches to PHP code when the dates fall outside
-the 32-bit signed integer range.
-
-GREGORIAN CORRECTION
-
-Pope Gregory shortened October of A.D. 1582 by ten days. Thursday,
-October 4, 1582 (Julian) was followed immediately by Friday, October 15,
-1582 (Gregorian).
-
-Since 0.06, we handle this correctly, so:
-
-adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582)
-	== 24 * 3600 (1 day)
-
-=============================================================================
-
-COPYRIGHT
-
-(c) 2003-2014 John Lim and released under BSD-style license except for code by
-jackbbs, which includes adodb_mktime, adodb_get_gmt_diff, adodb_is_leap_year
-and originally found at http://www.php.net/manual/en/function.mktime.php
-
-=============================================================================
-
-BUG REPORTS
-
-These should be posted to the ADOdb forums at
-
-	http://phplens.com/lens/lensforum/topics.php?id=4
-
-=============================================================================
-
-FUNCTION DESCRIPTIONS
-
-** FUNCTION adodb_time()
-
-Returns the current time measured in the number of seconds since the Unix Epoch (January 1 1970 00:00:00 GMT) as an unsigned integer.
-
-** FUNCTION adodb_getdate($date=false)
-
-Returns an array containing date information, as getdate(), but supports
-dates greater than 1901 to 2038. The local date/time format is derived from a
-heuristic the first time adodb_getdate is called.
-
-
-** FUNCTION adodb_date($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-The format fields that adodb_date supports:
-
-<pre>
-	a - "am" or "pm"
-	A - "AM" or "PM"
-	d - day of the month, 2 digits with leading zeros; i.e. "01" to "31"
-	D - day of the week, textual, 3 letters; e.g. "Fri"
-	F - month, textual, long; e.g. "January"
-	g - hour, 12-hour format without leading zeros; i.e. "1" to "12"
-	G - hour, 24-hour format without leading zeros; i.e. "0" to "23"
-	h - hour, 12-hour format; i.e. "01" to "12"
-	H - hour, 24-hour format; i.e. "00" to "23"
-	i - minutes; i.e. "00" to "59"
-	j - day of the month without leading zeros; i.e. "1" to "31"
-	l (lowercase 'L') - day of the week, textual, long; e.g. "Friday"
-	L - boolean for whether it is a leap year; i.e. "0" or "1"
-	m - month; i.e. "01" to "12"
-	M - month, textual, 3 letters; e.g. "Jan"
-	n - month without leading zeros; i.e. "1" to "12"
-	O - Difference to Greenwich time in hours; e.g. "+0200"
-	Q - Quarter, as in 1, 2, 3, 4
-	r - RFC 2822 formatted date; e.g. "Thu, 21 Dec 2000 16:01:07 +0200"
-	s - seconds; i.e. "00" to "59"
-	S - English ordinal suffix for the day of the month, 2 characters;
-	   			i.e. "st", "nd", "rd" or "th"
-	t - number of days in the given month; i.e. "28" to "31"
-	T - Timezone setting of this machine; e.g. "EST" or "MDT"
-	U - seconds since the Unix Epoch (January 1 1970 00:00:00 GMT)
-	w - day of the week, numeric, i.e. "0" (Sunday) to "6" (Saturday)
-	Y - year, 4 digits; e.g. "1999"
-	y - year, 2 digits; e.g. "99"
-	z - day of the year; i.e. "0" to "365"
-	Z - timezone offset in seconds (i.e. "-43200" to "43200").
-	   			The offset for timezones west of UTC is always negative,
-				and for those east of UTC is always positive.
-</pre>
-
-Unsupported:
-<pre>
-	B - Swatch Internet time
-	I (capital i) - "1" if Daylight Savings Time, "0" otherwise.
-	W - ISO-8601 week number of year, weeks starting on Monday
-
-</pre>
-
-
-** FUNCTION adodb_date2($fmt, $isoDateString = false)
-Same as adodb_date, but 2nd parameter accepts iso date, eg.
-
-  adodb_date2('d-M-Y H:i','2003-12-25 13:01:34');
-
-
-** FUNCTION adodb_gmdate($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted GMT date. If $timestamp is not defined, the
-current timestamp is used. Unlike the function date(), it supports dates
-outside the 1901 to 2038 range.
-
-
-** FUNCTION adodb_mktime($hr, $min, $sec[, $month, $day, $year])
-
-Converts a local date to a unix timestamp.  Unlike the function mktime(), it supports
-dates outside the 1901 to 2038 range. All parameters are optional.
-
-
-** FUNCTION adodb_gmmktime($hr, $min, $sec [, $month, $day, $year])
-
-Converts a gmt date to a unix timestamp.  Unlike the function gmmktime(), it supports
-dates outside the 1901 to 2038 range. Differs from gmmktime() in that all parameters
-are currently compulsory.
-
-** FUNCTION adodb_gmstrftime($fmt, $timestamp = false)
-Convert a timestamp to a formatted GMT date.
-
-** FUNCTION adodb_strftime($fmt, $timestamp = false)
-
-Convert a timestamp to a formatted local date. Internally converts $fmt into
-adodb_date format, then echo result.
-
-For best results, you can define the local date format yourself. Define a global
-variable $ADODB_DATE_LOCALE which is an array, 1st element is date format using
-adodb_date syntax, and 2nd element is the time format, also in adodb_date syntax.
-
-    eg. $ADODB_DATE_LOCALE = array('d/m/Y','H:i:s');
-
-	Supported format codes:
-
-<pre>
-	%a - abbreviated weekday name according to the current locale
-	%A - full weekday name according to the current locale
-	%b - abbreviated month name according to the current locale
-	%B - full month name according to the current locale
-	%c - preferred date and time representation for the current locale
-	%d - day of the month as a decimal number (range 01 to 31)
-	%D - same as %m/%d/%y
-	%e - day of the month as a decimal number, a single digit is preceded by a space (range ' 1' to '31')
-	%h - same as %b
-	%H - hour as a decimal number using a 24-hour clock (range 00 to 23)
-	%I - hour as a decimal number using a 12-hour clock (range 01 to 12)
-	%m - month as a decimal number (range 01 to 12)
-	%M - minute as a decimal number
-	%n - newline character
-	%p - either `am' or `pm' according to the given time value, or the corresponding strings for the current locale
-	%r - time in a.m. and p.m. notation
-	%R - time in 24 hour notation
-	%S - second as a decimal number
-	%t - tab character
-	%T - current time, equal to %H:%M:%S
-	%x - preferred date representation for the current locale without the time
-	%X - preferred time representation for the current locale without the date
-	%y - year as a decimal number without a century (range 00 to 99)
-	%Y - year as a decimal number including the century
-	%Z - time zone or name or abbreviation
-	%% - a literal `%' character
-</pre>
-
-	Unsupported codes:
-<pre>
-	%C - century number (the year divided by 100 and truncated to an integer, range 00 to 99)
-	%g - like %G, but without the century.
-	%G - The 4-digit year corresponding to the ISO week number (see %V).
-	     This has the same format and value as %Y, except that if the ISO week number belongs
-		 to the previous or next year, that year is used instead.
-	%j - day of the year as a decimal number (range 001 to 366)
-	%u - weekday as a decimal number [1,7], with 1 representing Monday
-	%U - week number of the current year as a decimal number, starting
-	    with the first Sunday as the first day of the first week
-	%V - The ISO 8601:1988 week number of the current year as a decimal number,
-	     range 01 to 53, where week 1 is the first week that has at least 4 days in the
-		 current year, and with Monday as the first day of the week. (Use %G or %g for
-		 the year component that corresponds to the week number for the specified timestamp.)
-	%w - day of the week as a decimal, Sunday being 0
-	%W - week number of the current year as a decimal number, starting with the
-	     first Monday as the first day of the first week
-</pre>
-
-=============================================================================
-
-NOTES
-
-Useful url for generating test timestamps:
-	http://www.4webhelp.net/us/timestamp.php
-
-Possible future optimizations include
-
-a. Using an algorithm similar to Plauger's in "The Standard C Library"
-(page 428, xttotm.c _Ttotm() function). Plauger's algorithm will not
-work outside 32-bit signed range, so i decided not to implement it.
-
-b. Implement daylight savings, which looks awfully complicated, see
-	http://webexhibits.org/daylightsaving/
-
-
-CHANGELOG
-- 16 Jan 2011 0.36
-Added adodb_time() which returns current time. If > 2038, will return as float
-
-- 7 Feb 2011 0.35
-Changed adodb_date to be symmetric with adodb_mktime. See $jan1_71. fix for bc.
-
-- 13 July 2010 0.34
-Changed adodb_get_gm_diff to use DateTimeZone().
-
-- 11 Feb 2008 0.33
-* Bug in 0.32 fix for hour handling. Fixed.
-
-- 1 Feb 2008 0.32
-* Now adodb_mktime(0,0,0,12+$m,20,2040) works properly.
-
-- 10 Jan 2008 0.31
-* Now adodb_mktime(0,0,0,24,1,2037) works correctly.
-
-- 15 July 2007 0.30
-Added PHP 5.2.0 compatability fixes.
- * gmtime behaviour for 1970 has changed. We use the actual date if it is between 1970 to 2038 to get the
- * timezone, otherwise we use the current year as the baseline to retrieve the timezone.
- * Also the timezone's in php 5.2.* support historical data better, eg. if timezone today was +8, but
-   in 1970 it was +7:30, then php 5.2 return +7:30, while this library will use +8.
- *
-
-- 19 March 2006 0.24
-Changed strftime() locale detection, because some locales prepend the day of week to the date when %c is used.
-
-- 10 Feb 2006 0.23
-PHP5 compat: when we detect PHP5, the RFC2822 format for gmt 0000hrs is changed from -0000 to +0000.
-	In PHP4, we will still use -0000 for 100% compat with PHP4.
-
-- 08 Sept 2005 0.22
-In adodb_date2(), $is_gmt not supported properly. Fixed.
-
-- 18 July  2005 0.21
-In PHP 4.3.11, the 'r' format has changed. Leading 0 in day is added. Changed for compat.
-Added support for negative months in adodb_mktime().
-
-- 24 Feb 2005 0.20
-Added limited strftime/gmstrftime support. x10 improvement in performance of adodb_date().
-
-- 21 Dec 2004 0.17
-In adodb_getdate(), the timestamp was accidentally converted to gmt when $is_gmt is false.
-Also adodb_mktime(0,0,0) did not work properly. Both fixed thx Mauro.
-
-- 17 Nov 2004 0.16
-Removed intval typecast in adodb_mktime() for secs, allowing:
-	 adodb_mktime(0,0,0 + 2236672153,1,1,1934);
-Suggested by Ryan.
-
-- 18 July 2004 0.15
-All params in adodb_mktime were formerly compulsory. Now only the hour, min, secs is compulsory.
-This brings it more in line with mktime (still not identical).
-
-- 23 June 2004 0.14
-
-Allow you to define your own daylights savings function, adodb_daylight_sv.
-If the function is defined (somewhere in an include), then you can correct for daylights savings.
-
-In this example, we apply daylights savings in June or July, adding one hour. This is extremely
-unrealistic as it does not take into account time-zone, geographic location, current year.
-
-function adodb_daylight_sv(&$arr, $is_gmt)
-{
-	if ($is_gmt) return;
-	$m = $arr['mon'];
-	if ($m == 6 || $m == 7) $arr['hours'] += 1;
-}
-
-This is only called by adodb_date() and not by adodb_mktime().
-
-The format of $arr is
-Array (
-   [seconds] => 0
-   [minutes] => 0
-   [hours] => 0
-   [mday] => 1      # day of month, eg 1st day of the month
-   [mon] => 2       # month (eg. Feb)
-   [year] => 2102
-   [yday] => 31     # days in current year
-   [leap] =>        # true if leap year
-   [ndays] => 28    # no of days in current month
-   )
-
-
-- 28 Apr 2004 0.13
-Fixed adodb_date to properly support $is_gmt. Thx to Dimitar Angelov.
-
-- 20 Mar 2004 0.12
-Fixed month calculation error in adodb_date. 2102-June-01 appeared as 2102-May-32.
-
-- 26 Oct 2003 0.11
-Because of daylight savings problems (some systems apply daylight savings to
-January!!!), changed adodb_get_gmt_diff() to ignore daylight savings.
-
-- 9 Aug 2003 0.10
-Fixed bug with dates after 2038.
-See http://phplens.com/lens/lensforum/msgs.php?id=6980
-
-- 1 July 2003 0.09
-Added support for Q (Quarter).
-Added adodb_date2(), which accepts ISO date in 2nd param
-
-- 3 March 2003 0.08
-Added support for 'S' adodb_date() format char. Added constant ADODB_ALLOW_NEGATIVE_TS
-if you want PHP to handle negative timestamps between 1901 to 1969.
-
-- 27 Feb 2003 0.07
-All negative numbers handled by adodb now because of RH 7.3+ problems.
-See http://bugs.php.net/bug.php?id=20048&edit=2
-
-- 4 Feb 2003 0.06
-Fixed a typo, 1852 changed to 1582! This means that pre-1852 dates
-are now correctly handled.
-
-- 29 Jan 2003 0.05
-
-Leap year checking differs under Julian calendar (pre 1582). Also
-leap year code optimized by checking for most common case first.
-
-We also handle month overflow correctly in mktime (eg month set to 13).
-
-Day overflow for less than one month's days is supported.
-
-- 28 Jan 2003 0.04
-
-Gregorian correction handled. In PHP5, we might throw an error if
-mktime uses invalid dates around 5-14 Oct 1582. Released with ADOdb 3.10.
-Added limbo 5-14 Oct 1582 check, when we set to 15 Oct 1582.
-
-- 27 Jan 2003 0.03
-
-Fixed some more month problems due to gmt issues. Added constant ADODB_DATE_VERSION.
-Fixed calculation of days since start of year for <1970.
-
-- 27 Jan 2003 0.02
-
-Changed _adodb_getdate() to inline leap year checking for better performance.
-Fixed problem with time-zones west of GMT +0000.
-
-- 24 Jan 2003 0.01
-
-First implementation.
-*/
-
-
-/* Initialization */
-
-/*
-	Version Number
-*/
-define('ADODB_DATE_VERSION',0.35);
-
-$ADODB_DATETIME_CLASS = (PHP_VERSION >= 5.2);
-
-/*
-	This code was originally for windows. But apparently this problem happens
-	also with Linux, RH 7.3 and later!
-
-	glibc-2.2.5-34 and greater has been changed to return -1 for dates <
-	1970.  This used to work.  The problem exists with RedHat 7.3 and 8.0
-	echo (mktime(0, 0, 0, 1, 1, 1960));  // prints -1
-
-	References:
-	 http://bugs.php.net/bug.php?id=20048&edit=2
-	 http://lists.debian.org/debian-glibc/2002/debian-glibc-200205/msg00010.html
-*/
-
-if (!defined('ADODB_ALLOW_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
-
-function adodb_date_test_date($y1,$m,$d=13)
-{
-	$h = round(rand()% 24);
-	$t = adodb_mktime($h,0,0,$m,$d,$y1);
-	$rez = adodb_date('Y-n-j H:i:s',$t);
-	if ($h == 0) $h = '00';
-	else if ($h < 10) $h = '0'.$h;
-	if ("$y1-$m-$d $h:00:00" != $rez) {
-		print "<b>$y1 error, expected=$y1-$m-$d $h:00:00, adodb=$rez</b><br>";
-		return false;
-	}
-	return true;
-}
-
-function adodb_date_test_strftime($fmt)
-{
-	$s1 = strftime($fmt);
-	$s2 = adodb_strftime($fmt);
-
-	if ($s1 == $s2) return true;
-
-	echo "error for $fmt,  strftime=$s1, adodb=$s2<br>";
-	return false;
-}
-
-/**
-	 Test Suite
-*/
-function adodb_date_test()
-{
-
-	for ($m=-24; $m<=24; $m++)
-		echo "$m :",adodb_date('d-m-Y',adodb_mktime(0,0,0,1+$m,20,2040)),"<br>";
-
-	error_reporting(E_ALL);
-	print "<h4>Testing adodb_date and adodb_mktime. version=".ADODB_DATE_VERSION.' PHP='.PHP_VERSION."</h4>";
-	@set_time_limit(0);
-	$fail = false;
-
-	// This flag disables calling of PHP native functions, so we can properly test the code
-	if (!defined('ADODB_TEST_DATES')) define('ADODB_TEST_DATES',1);
-
-	$t = time();
-
-
-	$fmt = 'Y-m-d H:i:s';
-	echo '<pre>';
-	echo 'adodb: ',adodb_date($fmt,$t),'<br>';
-	echo 'php  : ',date($fmt,$t),'<br>';
-	echo '</pre>';
-
-	adodb_date_test_strftime('%Y %m %x %X');
-	adodb_date_test_strftime("%A %d %B %Y");
-	adodb_date_test_strftime("%H %M S");
-
-	$t = adodb_mktime(0,0,0);
-	if (!(adodb_date('Y-m-d') == date('Y-m-d'))) print 'Error in '.adodb_mktime(0,0,0).'<br>';
-
-	$t = adodb_mktime(0,0,0,6,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-06-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
-
-	$t = adodb_mktime(0,0,0,2,1,2102);
-	if (!(adodb_date('Y-m-d',$t) == '2102-02-01')) print 'Error in '.adodb_date('Y-m-d',$t).'<br>';
-
-
-	print "<p>Testing gregorian <=> julian conversion<p>";
-	$t = adodb_mktime(0,0,0,10,11,1492);
-	//http://www.holidayorigins.com/html/columbus_day.html - Friday check
-	if (!(adodb_date('D Y-m-d',$t) == 'Fri 1492-10-11')) print 'Error in Columbus landing<br>';
-
-	$t = adodb_mktime(0,0,0,2,29,1500);
-	if (!(adodb_date('Y-m-d',$t) == '1500-02-29')) print 'Error in julian leap years<br>';
-
-	$t = adodb_mktime(0,0,0,2,29,1700);
-	if (!(adodb_date('Y-m-d',$t) == '1700-03-01')) print 'Error in gregorian leap years<br>';
-
-	print  adodb_mktime(0,0,0,10,4,1582).' ';
-	print adodb_mktime(0,0,0,10,15,1582);
-	$diff = (adodb_mktime(0,0,0,10,15,1582) - adodb_mktime(0,0,0,10,4,1582));
-	if ($diff != 3600*24) print " <b>Error in gregorian correction = ".($diff/3600/24)." days </b><br>";
-
-	print " 15 Oct 1582, Fri=".(adodb_dow(1582,10,15) == 5 ? 'Fri' : '<b>Error</b>')."<br>";
-	print " 4 Oct 1582, Thu=".(adodb_dow(1582,10,4) == 4 ? 'Thu' : '<b>Error</b>')."<br>";
-
-	print "<p>Testing overflow<p>";
-
-	$t = adodb_mktime(0,0,0,3,33,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-04-02')) print 'Error in day overflow 1 <br>';
-	$t = adodb_mktime(0,0,0,4,33,1971);
-	if (!(adodb_date('Y-m-d',$t) == '1971-05-03')) print 'Error in day overflow 2 <br>';
-	$t = adodb_mktime(0,0,0,1,60,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1965-03-01')) print 'Error in day overflow 3 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,12,32,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-01')) print 'Error in day overflow 4 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,12,63,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-02-01')) print 'Error in day overflow 5 '.adodb_date('Y-m-d',$t).' <br>';
-	$t = adodb_mktime(0,0,0,13,3,1965);
-	if (!(adodb_date('Y-m-d',$t) == '1966-01-03')) print 'Error in mth overflow 1 <br>';
-
-	print "Testing 2-digit => 4-digit year conversion<p>";
-	if (adodb_year_digit_check(00) != 2000) print "Err 2-digit 2000<br>";
-	if (adodb_year_digit_check(10) != 2010) print "Err 2-digit 2010<br>";
-	if (adodb_year_digit_check(20) != 2020) print "Err 2-digit 2020<br>";
-	if (adodb_year_digit_check(30) != 2030) print "Err 2-digit 2030<br>";
-	if (adodb_year_digit_check(40) != 1940) print "Err 2-digit 1940<br>";
-	if (adodb_year_digit_check(50) != 1950) print "Err 2-digit 1950<br>";
-	if (adodb_year_digit_check(90) != 1990) print "Err 2-digit 1990<br>";
-
-	// Test string formating
-	print "<p>Testing date formating</p>";
-
-	$fmt = '\d\a\t\e T Y-m-d H:i:s a A d D F g G h H i j l L m M n O \R\F\C2822 r s t U w y Y z Z 2003';
-	$s1 = date($fmt,0);
-	$s2 = adodb_date($fmt,0);
-	if ($s1 != $s2) {
-		print " date() 0 failed<br>$s1<br>$s2<br>";
-	}
-	flush();
-	for ($i=100; --$i > 0; ) {
-
-		$ts = 3600.0*((rand()%60000)+(rand()%60000))+(rand()%60000);
-		$s1 = date($fmt,$ts);
-		$s2 = adodb_date($fmt,$ts);
-		//print "$s1 <br>$s2 <p>";
-		$pos = strcmp($s1,$s2);
-
-		if (($s1) != ($s2)) {
-			for ($j=0,$k=strlen($s1); $j < $k; $j++) {
-				if ($s1[$j] != $s2[$j]) {
-					print substr($s1,$j).' ';
-					break;
-				}
-			}
-			print "<b>Error date(): $ts<br><pre>
-&nbsp; \"$s1\" (date len=".strlen($s1).")
-&nbsp; \"$s2\" (adodb_date len=".strlen($s2).")</b></pre><br>";
-			$fail = true;
-		}
-
-		$a1 = getdate($ts);
-		$a2 = adodb_getdate($ts);
-		$rez = array_diff($a1,$a2);
-		if (sizeof($rez)>0) {
-			print "<b>Error getdate() $ts</b><br>";
-				print_r($a1);
-			print "<br>";
-				print_r($a2);
-			print "<p>";
-			$fail = true;
-		}
-	}
-
-	// Test generation of dates outside 1901-2038
-	print "<p>Testing random dates between 100 and 4000</p>";
-	adodb_date_test_date(100,1);
-	for ($i=100; --$i >= 0;) {
-		$y1 = 100+rand(0,1970-100);
-		$m = rand(1,12);
-		adodb_date_test_date($y1,$m);
-
-		$y1 = 3000-rand(0,3000-1970);
-		adodb_date_test_date($y1,$m);
-	}
-	print '<p>';
-	$start = 1960+rand(0,10);
-	$yrs = 12;
-	$i = 365.25*86400*($start-1970);
-	$offset = 36000+rand(10000,60000);
-	$max = 365*$yrs*86400;
-	$lastyear = 0;
-
-	// we generate a timestamp, convert it to a date, and convert it back to a timestamp
-	// and check if the roundtrip broke the original timestamp value.
-	print "Testing $start to ".($start+$yrs).", or $max seconds, offset=$offset: ";
-	$cnt = 0;
-	for ($max += $i; $i < $max; $i += $offset) {
-		$ret = adodb_date('m,d,Y,H,i,s',$i);
-		$arr = explode(',',$ret);
-		if ($lastyear != $arr[2]) {
-			$lastyear = $arr[2];
-			print " $lastyear ";
-			flush();
-		}
-		$newi = adodb_mktime($arr[3],$arr[4],$arr[5],$arr[0],$arr[1],$arr[2]);
-		if ($i != $newi) {
-			print "Error at $i, adodb_mktime returned $newi ($ret)";
-			$fail = true;
-			break;
-		}
-		$cnt += 1;
-	}
-	echo "Tested $cnt dates<br>";
-	if (!$fail) print "<p>Passed !</p>";
-	else print "<p><b>Failed</b> :-(</p>";
-}
-
-function adodb_time()
-{
-	$d = new DateTime();
-	return $d->format('U');
-}
-
-/**
-	Returns day of week, 0 = Sunday,... 6=Saturday.
-	Algorithm from PEAR::Date_Calc
-*/
-function adodb_dow($year, $month, $day)
-{
-/*
-Pope Gregory removed 10 days - October 5 to October 14 - from the year 1582 and
-proclaimed that from that time onwards 3 days would be dropped from the calendar
-every 400 years.
-
-Thursday, October 4, 1582 (Julian) was followed immediately by Friday, October 15, 1582 (Gregorian).
-*/
-	if ($year <= 1582) {
-		if ($year < 1582 ||
-			($year == 1582 && ($month < 10 || ($month == 10 && $day < 15)))) $greg_correction = 3;
-		 else
-			$greg_correction = 0;
-	} else
-		$greg_correction = 0;
-
-	if($month > 2)
-	    $month -= 2;
-	else {
-	    $month += 10;
-	    $year--;
-	}
-
-	$day =  floor((13 * $month - 1) / 5) +
-	        $day + ($year % 100) +
-	        floor(($year % 100) / 4) +
-	        floor(($year / 100) / 4) - 2 *
-	        floor($year / 100) + 77 + $greg_correction;
-
-	return $day - 7 * floor($day / 7);
-}
-
-
-/**
- Checks for leap year, returns true if it is. No 2-digit year check. Also
- handles julian calendar correctly.
-*/
-function _adodb_is_leap_year($year)
-{
-	if ($year % 4 != 0) return false;
-
-	if ($year % 400 == 0) {
-		return true;
-	// if gregorian calendar (>1582), century not-divisible by 400 is not leap
-	} else if ($year > 1582 && $year % 100 == 0 ) {
-		return false;
-	}
-
-	return true;
-}
-
-
-/**
- checks for leap year, returns true if it is. Has 2-digit year check
-*/
-function adodb_is_leap_year($year)
-{
-	return  _adodb_is_leap_year(adodb_year_digit_check($year));
-}
-
-/**
-	Fix 2-digit years. Works for any century.
- 	Assumes that if 2-digit is more than 30 years in future, then previous century.
-*/
-function adodb_year_digit_check($y)
-{
-	if ($y < 100) {
-
-		$yr = (integer) date("Y");
-		$century = (integer) ($yr /100);
-
-		if ($yr%100 > 50) {
-			$c1 = $century + 1;
-			$c0 = $century;
-		} else {
-			$c1 = $century;
-			$c0 = $century - 1;
-		}
-		$c1 *= 100;
-		// if 2-digit year is less than 30 years in future, set it to this century
-		// otherwise if more than 30 years in future, then we set 2-digit year to the prev century.
-		if (($y + $c1) < $yr+30) $y = $y + $c1;
-		else $y = $y + $c0*100;
-	}
-	return $y;
-}
-
-function adodb_get_gmt_diff_ts($ts)
-{
-	if (0 <= $ts && $ts <= 0x7FFFFFFF) { // check if number in 32-bit signed range) {
-		$arr = getdate($ts);
-		$y = $arr['year'];
-		$m = $arr['mon'];
-		$d = $arr['mday'];
-		return adodb_get_gmt_diff($y,$m,$d);
-	} else {
-		return adodb_get_gmt_diff(false,false,false);
-	}
-
-}
-
-/**
- get local time zone offset from GMT. Does not handle historical timezones before 1970.
-*/
-function adodb_get_gmt_diff($y,$m,$d)
-{
-static $TZ,$tzo;
-global $ADODB_DATETIME_CLASS;
-
-	if (!defined('ADODB_TEST_DATES')) $y = false;
-	else if ($y < 1970 || $y >= 2038) $y = false;
-
-	if ($ADODB_DATETIME_CLASS && $y !== false) {
-		$dt = new DateTime();
-		$dt->setISODate($y,$m,$d);
-		if (empty($tzo)) {
-			$tzo = new DateTimeZone(date_default_timezone_get());
-		#	$tzt = timezone_transitions_get( $tzo );
-		}
-		return -$tzo->getOffset($dt);
-	} else {
-		if (isset($TZ)) return $TZ;
-		$y = date('Y');
-		/*
-		if (function_exists('date_default_timezone_get') && function_exists('timezone_offset_get')) {
-			$tzonename = date_default_timezone_get();
-			if ($tzonename) {
-				$tobj = new DateTimeZone($tzonename);
-				$TZ = -timezone_offset_get($tobj,new DateTime("now",$tzo));
-			}
-		}
-		*/
-		if (empty($TZ)) $TZ = mktime(0,0,0,12,2,$y) - gmmktime(0,0,0,12,2,$y);
-	}
-	return $TZ;
-}
-
-/**
-	Returns an array with date info.
-*/
-function adodb_getdate($d=false,$fast=false)
-{
-	if ($d === false) return getdate();
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= 0) // if windows, must be +ve integer
-				return @getdate($d);
-		}
-	}
-	return _adodb_getdate($d);
-}
-
-/*
-// generate $YRS table for _adodb_getdate()
-function adodb_date_gentable($out=true)
-{
-
-	for ($i=1970; $i >= 1600; $i-=10) {
-		$s = adodb_gmmktime(0,0,0,1,1,$i);
-		echo "$i => $s,<br>";
-	}
-}
-adodb_date_gentable();
-
-for ($i=1970; $i > 1500; $i--) {
-
-echo "<hr />$i ";
-	adodb_date_test_date($i,1,1);
-}
-
-*/
-
-
-$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-
-function adodb_validdate($y,$m,$d)
-{
-global $_month_table_normal,$_month_table_leaf;
-
-	if (_adodb_is_leap_year($y)) $marr = $_month_table_leaf;
-	else $marr = $_month_table_normal;
-
-	if ($m > 12 || $m < 1) return false;
-
-	if ($d > 31 || $d < 1) return false;
-
-	if ($marr[$m] < $d) return false;
-
-	if ($y < 1000 && $y > 3000) return false;
-
-	return true;
-}
-
-/**
-	Low-level function that returns the getdate() array. We have a special
-	$fast flag, which if set to true, will return fewer array values,
-	and is much faster as it does not calculate dow, etc.
-*/
-function _adodb_getdate($origd=false,$fast=false,$is_gmt=false)
-{
-static $YRS;
-global $_month_table_normal,$_month_table_leaf;
-
-	$d =  $origd - ($is_gmt ? 0 : adodb_get_gmt_diff_ts($origd));
-	$_day_power = 86400;
-	$_hour_power = 3600;
-	$_min_power = 60;
-
-	if ($d < -12219321600) $d -= 86400*10; // if 15 Oct 1582 or earlier, gregorian correction
-
-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-
-	$d366 = $_day_power * 366;
-	$d365 = $_day_power * 365;
-
-	if ($d < 0) {
-
-		if (empty($YRS)) $YRS = array(
-			1970 => 0,
-			1960 => -315619200,
-			1950 => -631152000,
-			1940 => -946771200,
-			1930 => -1262304000,
-			1920 => -1577923200,
-			1910 => -1893456000,
-			1900 => -2208988800,
-			1890 => -2524521600,
-			1880 => -2840140800,
-			1870 => -3155673600,
-			1860 => -3471292800,
-			1850 => -3786825600,
-			1840 => -4102444800,
-			1830 => -4417977600,
-			1820 => -4733596800,
-			1810 => -5049129600,
-			1800 => -5364662400,
-			1790 => -5680195200,
-			1780 => -5995814400,
-			1770 => -6311347200,
-			1760 => -6626966400,
-			1750 => -6942499200,
-			1740 => -7258118400,
-			1730 => -7573651200,
-			1720 => -7889270400,
-			1710 => -8204803200,
-			1700 => -8520336000,
-			1690 => -8835868800,
-			1680 => -9151488000,
-			1670 => -9467020800,
-			1660 => -9782640000,
-			1650 => -10098172800,
-			1640 => -10413792000,
-			1630 => -10729324800,
-			1620 => -11044944000,
-			1610 => -11360476800,
-			1600 => -11676096000);
-
-		if ($is_gmt) $origd = $d;
-		// The valid range of a 32bit signed timestamp is typically from
-		// Fri, 13 Dec 1901 20:45:54 GMT to Tue, 19 Jan 2038 03:14:07 GMT
-		//
-
-		# old algorithm iterates through all years. new algorithm does it in
-		# 10 year blocks
-
-		/*
-		# old algo
-		for ($a = 1970 ; --$a >= 0;) {
-			$lastd = $d;
-
-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
-			else $d += $d365;
-
-			if ($d >= 0) {
-				$year = $a;
-				break;
-			}
-		}
-		*/
-
-		$lastsecs = 0;
-		$lastyear = 1970;
-		foreach($YRS as $year => $secs) {
-			if ($d >= $secs) {
-				$a = $lastyear;
-				break;
-			}
-			$lastsecs = $secs;
-			$lastyear = $year;
-		}
-
-		$d -= $lastsecs;
-		if (!isset($a)) $a = $lastyear;
-
-		//echo ' yr=',$a,' ', $d,'.';
-
-		for (; --$a >= 0;) {
-			$lastd = $d;
-
-			if ($leaf = _adodb_is_leap_year($a)) $d += $d366;
-			else $d += $d365;
-
-			if ($d >= 0) {
-				$year = $a;
-				break;
-			}
-		}
-		/**/
-
-		$secsInYear = 86400 * ($leaf ? 366 : 365) + $lastd;
-
-		$d = $lastd;
-		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 13 ; --$a > 0;) {
-			$lastd = $d;
-			$d += $mtab[$a] * $_day_power;
-			if ($d >= 0) {
-				$month = $a;
-				$ndays = $mtab[$a];
-				break;
-			}
-		}
-
-		$d = $lastd;
-		$day = $ndays + ceil(($d+1) / ($_day_power));
-
-		$d += ($ndays - $day+1)* $_day_power;
-		$hour = floor($d/$_hour_power);
-
-	} else {
-		for ($a = 1970 ;; $a++) {
-			$lastd = $d;
-
-			if ($leaf = _adodb_is_leap_year($a)) $d -= $d366;
-			else $d -= $d365;
-			if ($d < 0) {
-				$year = $a;
-				break;
-			}
-		}
-		$secsInYear = $lastd;
-		$d = $lastd;
-		$mtab = ($leaf) ? $_month_table_leaf : $_month_table_normal;
-		for ($a = 1 ; $a <= 12; $a++) {
-			$lastd = $d;
-			$d -= $mtab[$a] * $_day_power;
-			if ($d < 0) {
-				$month = $a;
-				$ndays = $mtab[$a];
-				break;
-			}
-		}
-		$d = $lastd;
-		$day = ceil(($d+1) / $_day_power);
-		$d = $d - ($day-1) * $_day_power;
-		$hour = floor($d /$_hour_power);
-	}
-
-	$d -= $hour * $_hour_power;
-	$min = floor($d/$_min_power);
-	$secs = $d - $min * $_min_power;
-	if ($fast) {
-		return array(
-		'seconds' => $secs,
-		'minutes' => $min,
-		'hours' => $hour,
-		'mday' => $day,
-		'mon' => $month,
-		'year' => $year,
-		'yday' => floor($secsInYear/$_day_power),
-		'leap' => $leaf,
-		'ndays' => $ndays
-		);
-	}
-
-
-	$dow = adodb_dow($year,$month,$day);
-
-	return array(
-		'seconds' => $secs,
-		'minutes' => $min,
-		'hours' => $hour,
-		'mday' => $day,
-		'wday' => $dow,
-		'mon' => $month,
-		'year' => $year,
-		'yday' => floor($secsInYear/$_day_power),
-		'weekday' => gmdate('l',$_day_power*(3+$dow)),
-		'month' => gmdate('F',mktime(0,0,0,$month,2,1971)),
-		0 => $origd
-	);
-}
-/*
-		if ($isphp5)
-				$dates .= sprintf('%s%04d',($gmt<=0)?'+':'-',abs($gmt)/36);
-			else
-				$dates .= sprintf('%s%04d',($gmt<0)?'+':'-',abs($gmt)/36);
-			break;*/
-function adodb_tz_offset($gmt,$isphp5)
-{
-	$zhrs = abs($gmt)/3600;
-	$hrs = floor($zhrs);
-	if ($isphp5)
-		return sprintf('%s%02d%02d',($gmt<=0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
-	else
-		return sprintf('%s%02d%02d',($gmt<0)?'+':'-',floor($zhrs),($zhrs-$hrs)*60);
-}
-
-
-function adodb_gmdate($fmt,$d=false)
-{
-	return adodb_date($fmt,$d,true);
-}
-
-// accepts unix timestamp and iso date format in $d
-function adodb_date2($fmt, $d=false, $is_gmt=false)
-{
-	if ($d !== false) {
-		if (!preg_match(
-			"|^([0-9]{4})[-/\.]?([0-9]{1,2})[-/\.]?([0-9]{1,2})[ -]?(([0-9]{1,2}):?([0-9]{1,2}):?([0-9\.]{1,4}))?|",
-			($d), $rr)) return adodb_date($fmt,false,$is_gmt);
-
-		if ($rr[1] <= 100 && $rr[2]<= 1) return adodb_date($fmt,false,$is_gmt);
-
-		// h-m-s-MM-DD-YY
-		if (!isset($rr[5])) $d = adodb_mktime(0,0,0,$rr[2],$rr[3],$rr[1],false,$is_gmt);
-		else $d = @adodb_mktime($rr[5],$rr[6],$rr[7],$rr[2],$rr[3],$rr[1],false,$is_gmt);
-	}
-
-	return adodb_date($fmt,$d,$is_gmt);
-}
-
-
-/**
-	Return formatted date based on timestamp $d
-*/
-function adodb_date($fmt,$d=false,$is_gmt=false)
-{
-static $daylight;
-global $ADODB_DATETIME_CLASS;
-static $jan1_1971;
-
-
-	if (!isset($daylight)) {
-		$daylight = function_exists('adodb_daylight_sv');
-		if (empty($jan1_1971)) $jan1_1971 = mktime(0,0,0,1,1,1971); // we only use date() when > 1970 as adodb_mktime() only uses mktime() when > 1970
-	}
-
-	if ($d === false) return ($is_gmt)? @gmdate($fmt): @date($fmt);
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($d) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $d >= $jan1_1971) // if windows, must be +ve integer
-				return ($is_gmt)? @gmdate($fmt,$d): @date($fmt,$d);
-
-		}
-	}
-	$_day_power = 86400;
-
-	$arr = _adodb_getdate($d,true,$is_gmt);
-
-	if ($daylight) adodb_daylight_sv($arr, $is_gmt);
-
-	$year = $arr['year'];
-	$month = $arr['mon'];
-	$day = $arr['mday'];
-	$hour = $arr['hours'];
-	$min = $arr['minutes'];
-	$secs = $arr['seconds'];
-
-	$max = strlen($fmt);
-	$dates = '';
-
-	$isphp5 = PHP_VERSION >= 5;
-
-	/*
-		at this point, we have the following integer vars to manipulate:
-		$year, $month, $day, $hour, $min, $secs
-	*/
-	for ($i=0; $i < $max; $i++) {
-		switch($fmt[$i]) {
-		case 'e':
-			$dates .= date('e');
-			break;
-		case 'T':
-			if ($ADODB_DATETIME_CLASS) {
-				$dt = new DateTime();
-				$dt->SetDate($year,$month,$day);
-				$dates .= $dt->Format('T');
-			} else
-				$dates .= date('T');
-			break;
-		// YEAR
-		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
-		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-
-			// 4.3.11 uses '04 Jun 2004'
-			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '
-				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour;
-
-			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
-
-			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
-
-			$gmt = adodb_get_gmt_diff($year,$month,$day);
-
-			$dates .= ' '.adodb_tz_offset($gmt,$isphp5);
-			break;
-
-		case 'Y': $dates .= $year; break;
-		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
-		// MONTH
-		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
-		case 'Q': $dates .= ($month+3)>>2; break;
-		case 'n': $dates .= $month; break;
-		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
-		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
-		// DAY
-		case 't': $dates .= $arr['ndays']; break;
-		case 'z': $dates .= $arr['yday']; break;
-		case 'w': $dates .= adodb_dow($year,$month,$day); break;
-		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'j': $dates .= $day; break;
-		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S':
-			$d10 = $day % 10;
-			if ($d10 == 1) $dates .= 'st';
-			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
-			else if ($d10 == 3) $dates .= 'rd';
-			else $dates .= 'th';
-			break;
-
-		// HOUR
-		case 'Z':
-			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
-		case 'O':
-			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
-
-			$dates .= adodb_tz_offset($gmt,$isphp5);
-			break;
-
-		case 'H':
-			if ($hour < 10) $dates .= '0'.$hour;
-			else $dates .= $hour;
-			break;
-		case 'h':
-			if ($hour > 12) $hh = $hour - 12;
-			else {
-				if ($hour == 0) $hh = '12';
-				else $hh = $hour;
-			}
-
-			if ($hh < 10) $dates .= '0'.$hh;
-			else $dates .= $hh;
-			break;
-
-		case 'G':
-			$dates .= $hour;
-			break;
-
-		case 'g':
-			if ($hour > 12) $hh = $hour - 12;
-			else {
-				if ($hour == 0) $hh = '12';
-				else $hh = $hour;
-			}
-			$dates .= $hh;
-			break;
-		// MINUTES
-		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
-		// SECONDS
-		case 'U': $dates .= $d; break;
-		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
-		// AM/PM
-		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
-		case 'a':
-			if ($hour>=12) $dates .= 'pm';
-			else $dates .= 'am';
-			break;
-		case 'A':
-			if ($hour>=12) $dates .= 'PM';
-			else $dates .= 'AM';
-			break;
-		default:
-			$dates .= $fmt[$i]; break;
-		// ESCAPE
-		case "\\":
-			$i++;
-			if ($i < $max) $dates .= $fmt[$i];
-			break;
-		}
-	}
-	return $dates;
-}
-
-/**
-	Returns a timestamp given a GMT/UTC time.
-	Note that $is_dst is not implemented and is ignored.
-*/
-function adodb_gmmktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false)
-{
-	return adodb_mktime($hr,$min,$sec,$mon,$day,$year,$is_dst,true);
-}
-
-/**
-	Return a timestamp given a local time. Originally by jackbbs.
-	Note that $is_dst is not implemented and is ignored.
-
-	Not a very fast algorithm - O(n) operation. Could be optimized to O(1).
-*/
-function adodb_mktime($hr,$min,$sec,$mon=false,$day=false,$year=false,$is_dst=false,$is_gmt=false)
-{
-	if (!defined('ADODB_TEST_DATES')) {
-
-		if ($mon === false) {
-			return $is_gmt? @gmmktime($hr,$min,$sec): @mktime($hr,$min,$sec);
-		}
-
-		// for windows, we don't check 1970 because with timezone differences,
-		// 1 Jan 1970 could generate negative timestamp, which is illegal
-		$usephpfns = (1970 < $year && $year < 2038
-			|| !defined('ADODB_NO_NEGATIVE_TS') && (1901 < $year && $year < 2038)
-			);
-
-
-		if ($usephpfns && ($year + $mon/12+$day/365.25+$hr/(24*365.25) >= 2038)) $usephpfns = false;
-
-		if ($usephpfns) {
-				return $is_gmt ?
-					@gmmktime($hr,$min,$sec,$mon,$day,$year):
-					@mktime($hr,$min,$sec,$mon,$day,$year);
-		}
-	}
-
-	$gmt_different = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$mon,$day);
-
-	/*
-	# disabled because some people place large values in $sec.
-	# however we need it for $mon because we use an array...
-	$hr = intval($hr);
-	$min = intval($min);
-	$sec = intval($sec);
-	*/
-	$mon = intval($mon);
-	$day = intval($day);
-	$year = intval($year);
-
-
-	$year = adodb_year_digit_check($year);
-
-	if ($mon > 12) {
-		$y = floor(($mon-1)/ 12);
-		$year += $y;
-		$mon -= $y*12;
-	} else if ($mon < 1) {
-		$y = ceil((1-$mon) / 12);
-		$year -= $y;
-		$mon += $y*12;
-	}
-
-	$_day_power = 86400;
-	$_hour_power = 3600;
-	$_min_power = 60;
-
-	$_month_table_normal = array("",31,28,31,30,31,30,31,31,30,31,30,31);
-	$_month_table_leaf = array("",31,29,31,30,31,30,31,31,30,31,30,31);
-
-	$_total_date = 0;
-	if ($year >= 1970) {
-		for ($a = 1970 ; $a <= $year; $a++) {
-			$leaf = _adodb_is_leap_year($a);
-			if ($leaf == true) {
-				$loop_table = $_month_table_leaf;
-				$_add_date = 366;
-			} else {
-				$loop_table = $_month_table_normal;
-				$_add_date = 365;
-			}
-			if ($a < $year) {
-				$_total_date += $_add_date;
-			} else {
-				for($b=1;$b<$mon;$b++) {
-					$_total_date += $loop_table[$b];
-				}
-			}
-		}
-		$_total_date +=$day-1;
-		$ret = $_total_date * $_day_power + $hr * $_hour_power + $min * $_min_power + $sec + $gmt_different;
-
-	} else {
-		for ($a = 1969 ; $a >= $year; $a--) {
-			$leaf = _adodb_is_leap_year($a);
-			if ($leaf == true) {
-				$loop_table = $_month_table_leaf;
-				$_add_date = 366;
-			} else {
-				$loop_table = $_month_table_normal;
-				$_add_date = 365;
-			}
-			if ($a > $year) { $_total_date += $_add_date;
-			} else {
-				for($b=12;$b>$mon;$b--) {
-					$_total_date += $loop_table[$b];
-				}
-			}
-		}
-		$_total_date += $loop_table[$mon] - $day;
-
-		$_day_time = $hr * $_hour_power + $min * $_min_power + $sec;
-		$_day_time = $_day_power - $_day_time;
-		$ret = -( $_total_date * $_day_power + $_day_time - $gmt_different);
-		if ($ret < -12220185600) $ret += 10*86400; // if earlier than 5 Oct 1582 - gregorian correction
-		else if ($ret < -12219321600) $ret = -12219321600; // if in limbo, reset to 15 Oct 1582.
-	}
-	//print " dmy=$day/$mon/$year $hr:$min:$sec => " .$ret;
-	return $ret;
-}
-
-function adodb_gmstrftime($fmt, $ts=false)
-{
-	return adodb_strftime($fmt,$ts,true);
-}
-
-// hack - convert to adodb_date
-function adodb_strftime($fmt, $ts=false,$is_gmt=false)
-{
-global $ADODB_DATE_LOCALE;
-
-	if (!defined('ADODB_TEST_DATES')) {
-		if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range
-			if (!defined('ADODB_NO_NEGATIVE_TS') || $ts >= 0) // if windows, must be +ve integer
-				return ($is_gmt)? @gmstrftime($fmt,$ts): @strftime($fmt,$ts);
-
-		}
-	}
-
-	if (empty($ADODB_DATE_LOCALE)) {
-	/*
-		$tstr = strtoupper(gmstrftime('%c',31366800)); // 30 Dec 1970, 1 am
-		$sep = substr($tstr,2,1);
-		$hasAM = strrpos($tstr,'M') !== false;
-	*/
-		# see http://phplens.com/lens/lensforum/msgs.php?id=14865 for reasoning, and changelog for version 0.24
-		$dstr = gmstrftime('%x',31366800); // 30 Dec 1970, 1 am
-		$sep = substr($dstr,2,1);
-		$tstr = strtoupper(gmstrftime('%X',31366800)); // 30 Dec 1970, 1 am
-		$hasAM = strrpos($tstr,'M') !== false;
-
-		$ADODB_DATE_LOCALE = array();
-		$ADODB_DATE_LOCALE[] =  strncmp($tstr,'30',2) == 0 ? 'd'.$sep.'m'.$sep.'y' : 'm'.$sep.'d'.$sep.'y';
-		$ADODB_DATE_LOCALE[]  = ($hasAM) ? 'h:i:s a' : 'H:i:s';
-
-	}
-	$inpct = false;
-	$fmtdate = '';
-	for ($i=0,$max = strlen($fmt); $i < $max; $i++) {
-		$ch = $fmt[$i];
-		if ($ch == '%') {
-			if ($inpct) {
-				$fmtdate .= '%';
-				$inpct = false;
-			} else
-				$inpct = true;
-		} else if ($inpct) {
-
-			$inpct = false;
-			switch($ch) {
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-			case 'E':
-			case 'O':
-				/* ignore format modifiers */
-				$inpct = true;
-				break;
-
-			case 'a': $fmtdate .= 'D'; break;
-			case 'A': $fmtdate .= 'l'; break;
-			case 'h':
-			case 'b': $fmtdate .= 'M'; break;
-			case 'B': $fmtdate .= 'F'; break;
-			case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
-			case 'C': $fmtdate .= '\C?'; break; // century
-			case 'd': $fmtdate .= 'd'; break;
-			case 'D': $fmtdate .= 'm/d/y'; break;
-			case 'e': $fmtdate .= 'j'; break;
-			case 'g': $fmtdate .= '\g?'; break; //?
-			case 'G': $fmtdate .= '\G?'; break; //?
-			case 'H': $fmtdate .= 'H'; break;
-			case 'I': $fmtdate .= 'h'; break;
-			case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
-			case 'm': $fmtdate .= 'm'; break;
-			case 'M': $fmtdate .= 'i'; break;
-			case 'n': $fmtdate .= "\n"; break;
-			case 'p': $fmtdate .= 'a'; break;
-			case 'r': $fmtdate .= 'h:i:s a'; break;
-			case 'R': $fmtdate .= 'H:i:s'; break;
-			case 'S': $fmtdate .= 's'; break;
-			case 't': $fmtdate .= "\t"; break;
-			case 'T': $fmtdate .= 'H:i:s'; break;
-			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-based
-			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
-			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
-			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-based
-			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'y': $fmtdate .= 'y'; break;
-			case 'Y': $fmtdate .= 'Y'; break;
-			case 'Z': $fmtdate .= 'T'; break;
-			}
-		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
-			$fmtdate .= "\\".$ch;
-		else
-			$fmtdate .= $ch;
-	}
-	//echo "fmt=",$fmtdate,"<br>";
-	if ($ts === false) $ts = time();
-	$ret = adodb_date($fmtdate, $ts, $is_gmt);
-	return $ret;
-}
diff --git a/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js b/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
deleted file mode 100644
index 0defc720496..00000000000
--- a/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
- For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
-*/
-(function(a){if("undefined"==typeof a)throw Error("jQuery should be loaded before CKEditor jQuery adapter.");if("undefined"==typeof CKEDITOR)throw Error("CKEditor should be loaded before CKEditor jQuery adapter.");CKEDITOR.config.jqueryOverrideVal="undefined"==typeof CKEDITOR.config.jqueryOverrideVal?!0:CKEDITOR.config.jqueryOverrideVal;a.extend(a.fn,{ckeditorGet:function(){var a=this.eq(0).data("ckeditorInstance");if(!a)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return a},
-ckeditor:function(g,e){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if("function"!==typeof g){var m=e;e=g;g=m}var k=[];e=e||{};this.each(function(){var b=a(this),c=b.data("ckeditorInstance"),f=b.data("_ckeditorInstanceLock"),h=this,l=new a.Deferred;k.push(l.promise());if(c&&!f)g&&g.apply(c,[this]),l.resolve();else if(f)c.once("instanceReady",function(){setTimeout(function d(){c.element?(c.element.$==h&&g&&g.apply(c,[h]),l.resolve()):setTimeout(d,100)},0)},null,null,
-9999);else{if(e.autoUpdateElement||"undefined"==typeof e.autoUpdateElement&&CKEDITOR.config.autoUpdateElement)e.autoUpdateElementJquery=!0;e.autoUpdateElement=!1;b.data("_ckeditorInstanceLock",!0);c=a(this).is("textarea")?CKEDITOR.replace(h,e):CKEDITOR.inline(h,e);b.data("ckeditorInstance",c);c.on("instanceReady",function(e){var d=e.editor;setTimeout(function n(){if(d.element){e.removeListener();d.on("dataReady",function(){b.trigger("dataReady.ckeditor",[d])});d.on("setData",function(a){b.trigger("setData.ckeditor",
-[d,a.data])});d.on("getData",function(a){b.trigger("getData.ckeditor",[d,a.data])},999);d.on("destroy",function(){b.trigger("destroy.ckeditor",[d])});d.on("save",function(){a(h.form).trigger("submit");return!1},null,null,20);if(d.config.autoUpdateElementJquery&&b.is("textarea")&&a(h.form).length){var c=function(){b.ckeditor(function(){d.updateElement()})};a(h.form).on("submit",c);a(h.form).on("form-pre-serialize",c);b.on("destroy.ckeditor",function(){a(h.form).off("submit",c);a(h.form).off("form-pre-serialize",
-c)})}d.on("destroy",function(){b.removeData("ckeditorInstance")});b.removeData("_ckeditorInstanceLock");b.trigger("instanceReady.ckeditor",[d]);g&&g.apply(d,[h]);l.resolve()}else setTimeout(n,100)},0)},null,null,9999)}});var f=new a.Deferred;this.promise=f.promise();a.when.apply(this,k).then(function(){f.resolve()});this.editor=this.eq(0).data("ckeditorInstance");return this}});CKEDITOR.config.jqueryOverrideVal&&(a.fn.val=CKEDITOR.tools.override(a.fn.val,function(g){return function(e){if(arguments.length){var m=
-this,k=[],f=this.each(function(){var b=a(this),c=b.data("ckeditorInstance");if(b.is("textarea")&&c){var f=new a.Deferred;c.setData(e,function(){f.resolve()});k.push(f.promise());return!0}return g.call(b,e)});if(k.length){var b=new a.Deferred;a.when.apply(this,k).done(function(){b.resolveWith(m)});return b.promise()}return f}var f=a(this).eq(0),c=f.data("ckeditorInstance");return f.is("textarea")&&c?c.getData():g.call(f)}}))})(window.jQuery);
\ No newline at end of file
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/README.md b/htdocs/install/doctemplates/websites/website_template-restaurant/README.md
index 3a656b8ddaf..a5b5c5abba9 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/README.md
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/README.md
@@ -1 +1,2 @@
 Website generated by Dolibarr ERP CRM
+This website template is an example of website for a restaurant
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/LICENSE b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/LICENSE
index 83294e71b2e..1143fd7823a 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/LICENSE
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/LICENSE
@@ -1,2 +1,8 @@
-Image are provided under the Unsplash+ License
-Rest of templates (HTML and PHP code) content are GPLv3
+LICENSE
+-------
+
+Images are provided under the license:
+Unsplash+ License
+
+Rest of templates (HTML and PHP code) content are under license
+CC-BY-SA - https://creativecommons.org/licenses/by/4.0/
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/README.md b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/README.md
index 3a656b8ddaf..a5b5c5abba9 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/README.md
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/README.md
@@ -1 +1,2 @@
 Website generated by Dolibarr ERP CRM
+This website template is an example of website for a restaurant
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/about.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/about.php
index c4816800d17..560719a4fda 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/about.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/about.php
@@ -1,5 +1,5 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require './page169.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page169.tpl.php';
+if (empty($dolibarr_main_data_root)) require './page248.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page248.tpl.php';
 ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/contact.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/contact.php
index 7d5db994e1b..e3a18e3b92d 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/contact.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/contact.php
@@ -1,5 +1,5 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require './page170.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page170.tpl.php';
+if (empty($dolibarr_main_data_root)) require './page249.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page249.tpl.php';
 ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/footer.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/footer.php
new file mode 100644
index 00000000000..4052f2ff8e9
--- /dev/null
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/footer.php
@@ -0,0 +1,5 @@
+<?php
+// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
+global $dolibarr_main_data_root;
+if (empty($dolibarr_main_data_root)) require './page252.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page252.tpl.php';
+?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/header.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/header.php
new file mode 100644
index 00000000000..530e4397e93
--- /dev/null
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/header.php
@@ -0,0 +1,5 @@
+<?php
+// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
+global $dolibarr_main_data_root;
+if (empty($dolibarr_main_data_root)) require './page253.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page253.tpl.php';
+?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/htmlheader.html b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/htmlheader.html
index 0de0b36283f..41e782b5934 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/htmlheader.html
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/htmlheader.html
@@ -1,6 +1,6 @@
 
 <link rel="stylesheet" id="google-fonts-css"  href="//fonts.googleapis.com/css?family=Open+Sans:300,400,700" />
-<link rel="stylesheet" id="font-wasesome-css" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
+<link rel="stylesheet" id="font-wasesome-css" type="text/css" href="/dolibarr_dev/htdocs/theme/common/fontawesome-5/css/all.min.css?layout=classic&amp;version=17.0.0-beta">
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
 
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/index.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/index.php
index dc10e0099f4..08ce45517af 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/index.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/index.php
@@ -1,11 +1,5 @@
 <?php
-// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load master if not already loaded
-if (!empty($_GET['pageref']) || !empty($_GET['pagealiasalt']) || !empty($_GET['pageid'])) {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
-	redirectToContainer($_GET['pageref'], $_GET['pagealiasalt'], $_GET['pageid']);
-}
-include_once './page171.tpl.php';
-// END PHP
+// File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
+global $dolibarr_main_data_root;
+if (empty($dolibarr_main_data_root)) require './page250.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page250.tpl.php';
+?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/javascript.js.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/javascript.js.php
index f58102cf00b..fe1f15266af 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/javascript.js.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/javascript.js.php
@@ -8,6 +8,7 @@ header('Cache-Control: max-age=3600, public, must-revalidate');
 header('Content-type: application/javascript');
 // END PHP ?>
 /* JS content (all pages) */
+// test
 <?php // BEGIN PHP
 $tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");
 // END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/menu.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/menu.php
index 7e4cd71a69d..57315e4da18 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/menu.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/menu.php
@@ -1,5 +1,5 @@
 <?php
 // File generated to wrap the alias page - DO NOT MODIFY - It is just a wrapper to real page
 global $dolibarr_main_data_root;
-if (empty($dolibarr_main_data_root)) require './page172.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page172.tpl.php';
+if (empty($dolibarr_main_data_root)) require './page251.tpl.php'; else require $dolibarr_main_data_root.'/website/'.$website->ref.'/page251.tpl.php';
 ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page169.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page169.tpl.php
deleted file mode 100644
index a592c302c73..00000000000
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page169.tpl.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php // BEGIN PHP
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
-	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
-} // Not already loaded
-require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
-ob_start();
-// END PHP ?>
-<html lang="en">
-<head>
-<title>About us</title>
-<meta charset="utf-8">
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="robots" content="index, follow" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="keywords" content="" />
-<meta name="title" content="About us" />
-<meta name="description" content="" />
-<meta name="generator" content="Dolibarr 17.0.0-alpha (https://www.dolibarr.org)" />
-<meta name="dolibarr:pageid" content="169" />
-<?php if ($website->use_manifest) { print '<link rel="manifest" href="/manifest.json.php" />'."\n"; } ?>
-<!-- Include link to CSS file -->
-<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />
-<!-- Include link to JS file -->
-<script async src="/javascript.js.php"></script>
-<!-- Include HTML header from common file -->
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
-<!-- Include HTML header from page header block -->
-
-</head>
-<!-- File generated by Dolibarr website module editor -->
-<body id="bodywebsite" class="bodywebsite bodywebpage-about">
-<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
-<section id="mysection1" contenteditable="true">
-    <nav class="navbar navbar-expand-lg bg-white shadow-lg">
-            <div class="container">
-                <button
-                    class="navbar-toggler"
-                    type="button"
-                    data-bs-toggle="collapse"
-                    data-bs-target="#navbarNav"
-                    aria-controls="navbarNav"
-                    aria-expanded="false"
-                    aria-label="Toggle navigation"
-                >
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-
-                <a class="navbar-brand" href="index.html"><?php echo $mysoc->name; ?></a>
-
-                <div class="d-lg-none">
-                    <a href="contact.php#reservation"
-                        type="button"
-                        class="custom-btn btn btn-danger"
-                        data-bs-toggle="modal"
-                        data-bs-target="#BookingModal"
-                    >
-                        Reservation
-                    </a>
-                </div>
-
-                <div class="collapse navbar-collapse" id="navbarNav">
-                    <ul class="navbar-nav mx-auto">
-                        <li class="nav-item">
-                            <a class="nav-link" href="index.php">Home</a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link active" href="about.php">About</a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="menu.php">Menu</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="contact.php">Contact</a>
-                        </li>
-                    </ul>
-                </div>
-
-                <div class="d-none d-lg-block">
-                    <a href="contact.php#reservation"
-                        type="button"
-                        class="custom-btn btn btn-danger"
-                        data-bs-toggle="modal"
-                        data-bs-target="#BookingModal"
-                    >
-                        Reservation
-                    </a>
-                </div>
-            </div>
-        </nav>
-
-        <main>
-
-            <header class="site-header site-about-header">
-                <div class="container">
-                    <div class="row">
-
-                        <div class="col-lg-10 col-12 mx-auto">
-                            <h1 class="text-white">About Us</h1>
-
-                            <strong class="text-white">Get to know us more</strong>
-                        </div>
-
-                    </div>
-                </div>
-
-                <div class="overlay"></div>
-            </header>           
-
-            <section class="about section-padding">
-                <div class="container">
-                    <div class="row">
-
-                        <div class="col-12">
-                            <h2 class="mb-5">Team Members</h2>
-                        </div>
-
-                        <div class="col-lg-4 col-12">
-                            <div class="team-thumb">
-                                <img src="image/mypersonalsite/team/matthew-hamilton-tNCH0sKSZbA-unsplash.jpg" class="img-fluid team-image" alt="">
-                                
-                                <div class="team-info">
-                                    <h4 class="mt-3 mb-0">Sophia</h4>
-
-                                    <p>CEO &amp; Founder</p>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-lg-4 col-12 my-lg-0 my-4">
-                            <div class="team-thumb">
-                                <img src="image/mypersonalsite/team/nicolas-horn-MTZTGvDsHFY-unsplash.jpg" class="img-fluid team-image" alt="">
-
-                                <h4 class="mt-3 mb-0">Benjamin W.</h4>
-
-                                <p>Restaurant Manager</p>
-                            </div>
-                        </div>
-
-                        <div class="col-lg-4 col-12">
-                            <div class="team-thumb">
-                                <img src="image/mypersonalsite/team/rc-cf-FMh5o5m5N9E-unsplash.jpg" class="img-fluid team-image" alt="">
-                                
-                                <h4 class="mt-3 mb-0">Muchen Jack</h4>
-
-                                <p>Senior Chef</p>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-            </section>
-            
-            
-            <!--
-            <section class="newsletter section-padding bg-white">
-                <div class="container">
-                    <div class="row">
-
-                        <div class="col-lg-6 col-12">
-                            <img src="image/mypersonalsite/charles-deluvio-FdDkfYFHqe4-unsplash.jpg" class="img-fluid newsletter-image" alt="">
-                        </div>
-
-                        <div class="col-lg-6 col-12 d-flex align-items-center mt-5 mt-lg-0 mx-auto">
-                            <div class="subscribe-form-wrap">
-                                <h4 class="mb-0">Our Newsletter</h4>
-
-                                <p>The food news every day</p>
-
-                                <form class="custom-form subscribe-form mt-4" role="form">
-                                    <input type="email" name="subscribe-email" id="subscribe-email" pattern="[^ @]*@[^ @]*" class="form-control" placeholder="Your email address" required="">
-
-                                    <button type="submit" class="form-control mb-3" id="subscribe">Subscribe</button>
-
-                                    <small>By signing up, you agree to our Privacy Notice and the data policy</small>
-                                    </div>
-                                </form>
-                            </div>
-                        </div>
-
-                    </div>
-                </div>
-            </section>
-            -->
-            
-        </main>
-
-</section>
-
-</body>
-</html>
-<?php // BEGIN PHP
-$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 169);
-// END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page172.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page172.tpl.php
deleted file mode 100644
index cf759e644a8..00000000000
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page172.tpl.php
+++ /dev/null
@@ -1,597 +0,0 @@
-<?php // BEGIN PHP
-$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
-if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
-	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
-	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
-} // Not already loaded
-require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
-ob_start();
-// END PHP ?>
-<html lang="en">
-<head>
-<title>Our menus</title>
-<meta charset="utf-8">
-<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<meta name="robots" content="index, follow" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="keywords" content="" />
-<meta name="title" content="Our menus" />
-<meta name="description" content="" />
-<meta name="generator" content="Dolibarr 17.0.0-alpha (https://www.dolibarr.org)" />
-<meta name="dolibarr:pageid" content="172" />
-<?php if ($website->use_manifest) { print '<link rel="manifest" href="/manifest.json.php" />'."\n"; } ?>
-<!-- Include link to CSS file -->
-<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />
-<!-- Include link to JS file -->
-<script async src="/javascript.js.php"></script>
-<!-- Include HTML header from common file -->
-<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
-<!-- Include HTML header from page header block -->
-
-</head>
-<!-- File generated by Dolibarr website module editor -->
-<body id="bodywebsite" class="bodywebsite bodywebpage-menu">
-<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
-<section id="mysection1" contenteditable="true">
-       <nav class="navbar navbar-expand-lg bg-white shadow-lg">
-            <div class="container">
-                <button
-                    class="navbar-toggler"
-                    type="button"
-                    data-bs-toggle="collapse"
-                    data-bs-target="#navbarNav"
-                    aria-controls="navbarNav"
-                    aria-expanded="false"
-                    aria-label="Toggle navigation"
-                >
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-
-                <a class="navbar-brand" href="index.html"><?php echo $mysoc->name; ?></a>
-
-                <div class="d-lg-none">
-                    <a href="contact.php#reservation"
-                        type="button"
-                        class="custom-btn btn btn-danger"
-                        data-bs-toggle="modal"
-                        data-bs-target="#BookingModal"
-                    >
-                        Reservation
-                    </a>
-                </div>
-
-                <div class="collapse navbar-collapse" id="navbarNav">
-                    <ul class="navbar-nav mx-auto">
-                        <li class="nav-item">
-                            <a class="nav-link" href="index.php">Home</a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="about.php">About</a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link active" href="menu.php">Menu</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="contact.php">Contact</a>
-                        </li>
-                    </ul>
-                </div>
-
-                <div class="d-none d-lg-block">
-                    <a href="contact.php#reservation"
-                        type="button"
-                        class="custom-btn btn btn-danger"
-                        data-bs-toggle="modal"
-                        data-bs-target="#BookingModal"
-                    >
-                        Reservation
-                    </a>
-                </div>
-            </div>
-        </nav>
-
-        <main>
-            <header class="site-header site-menu-header">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-lg-10 col-12 mx-auto">
-                            <h1 class="text-white">Our Menus</h1>
-
-                            <strong class="text-white"
-                                >Perfect for all Breakfast, Lunch and
-                                Dinner</strong
-                            >
-                        </div>
-                    </div>
-                </div>
-
-                <div class="overlay"></div>
-            </header>
-
-            <section class="menu section-padding">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-12">
-                            <h2 class="mb-lg-5 mb-4">Breakfast Menu</h2>
-                        </div>
-
-                        <div class="col-lg-4 col-md-6 col-12">
-                            <div class="menu-thumb">
-                                <img
-                                    src="image/mypersonalsite/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg"
-                                    class="img-fluid menu-image"
-                                    alt=""
-                                />
-
-                                <div
-                                    class="menu-info d-flex flex-wrap align-items-center"
-                                >
-                                    <h4 class="mb-0">Fresh Start</h4>
-
-                                    <span
-                                        class="price-tag bg-white shadow-lg ms-4"
-                                        ><small>$</small>24.50</span
-                                    >
-
-                                    <div
-                                        class="d-flex flex-wrap align-items-center w-100 mt-2"
-                                    >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            4.4/5
-                                        </h6>
-
-                                        <div class="reviews-stars">
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                        </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            128 Reviews
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-lg-4 col-md-6 col-12">
-                            <div class="menu-thumb">
-                                <img
-                                    src="/image/mypersonalsite/breakfast/lucas-swennen-1W_MyJSRLuQ-unsplash.jpg"
-                                    class="img-fluid menu-image"
-                                    alt=""
-                                />
-
-                                <div
-                                    class="menu-info d-flex flex-wrap align-items-center"
-                                >
-                                    <h4 class="mb-0">Baked Creamy</h4>
-
-                                    <span
-                                        class="price-tag bg-white shadow-lg ms-4"
-                                        ><small>$</small>16.50</span
-                                    >
-
-                                    <div
-                                        class="d-flex flex-wrap align-items-center w-100 mt-2"
-                                    >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
-                                        <div class="reviews-stars">
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                        </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            64 Reviews
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-lg-4 col-md-6 col-12">
-                            <div class="menu-thumb">
-                                <img
-                                    src="image/mypersonalsite/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg"
-                                    class="img-fluid menu-image"
-                                    alt=""
-                                />
-
-                                <div
-                                    class="menu-info d-flex flex-wrap align-items-center"
-                                >
-                                    <h4 class="mb-0">Burger Set</h4>
-
-                                    <span
-                                        class="price-tag bg-white shadow-lg ms-4"
-                                        ><small>$</small>24.50</span
-                                    >
-
-                                    <del class="ms-4"
-                                        ><small>$</small>36.50</del
-                                    >
-
-                                    <div
-                                        class="d-flex flex-wrap align-items-center w-100 mt-2"
-                                    >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
-                                        <div class="reviews-stars">
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                        </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            32 Reviews
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </section>
-
-            <section class="menu section-padding bg-white">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-12">
-                            <h2 class="mb-lg-5 mb-4">Lunch Menu</h2>
-                        </div>
-
-                        <div class="col-lg-6 col-12">
-                            <div class="menu-thumb">
-                                <img
-                                    src="image/mypersonalsite/lunch/louis-hansel-cH5IPjaAYyo-unsplash.jpg"
-                                    class="img-fluid menu-image"
-                                    alt=""
-                                />
-
-                                <div
-                                    class="menu-info d-flex flex-wrap align-items-center"
-                                >
-                                    <h4 class="mb-0">Super Steak Set</h4>
-
-                                    <span
-                                        class="price-tag bg-white shadow-lg ms-4"
-                                        ><small>$</small>32.75</span
-                                    >
-
-                                    <del class="ms-4"><small>$</small>55</del>
-
-                                    <div
-                                        class="d-flex flex-wrap align-items-center w-100 mt-2"
-                                    >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            4.2/5
-                                        </h6>
-
-                                        <div class="reviews-stars">
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                        </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            66 Reviews
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-lg-6 col-12">
-                            <div class="menu-thumb">
-                                <img
-                                    src="image/mypersonalsite/lunch/louis-hansel-rheOvfxOlOA-unsplash.jpg"
-                                    class="img-fluid menu-image"
-                                    alt=""
-                                />
-
-                                <div
-                                    class="menu-info d-flex flex-wrap align-items-center"
-                                >
-                                    <h4 class="mb-0">Bread &amp; Steak Set</h4>
-
-                                    <span
-                                        class="price-tag bg-white shadow-lg ms-4"
-                                        ><small>$</small>42.50</span
-                                    >
-
-                                    <div
-                                        class="d-flex flex-wrap align-items-center w-100 mt-2"
-                                    >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
-                                        <div class="reviews-stars">
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                        </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            84 Reviews
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </section>
-
-            <section class="menu section-padding">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-12">
-                            <h2 class="mb-lg-5 mb-4">Dinner Menu</h2>
-                        </div>
-
-                        <div class="col-lg-4 col-md-6 col-12">
-                            <div class="menu-thumb">
-                                <img
-                                    src="image/mypersonalsite/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg"
-                                    class="img-fluid menu-image"
-                                    alt=""
-                                />
-
-                                <div
-                                    class="menu-info d-flex flex-wrap align-items-center"
-                                >
-                                    <h4 class="mb-0">Seafood Set</h4>
-
-                                    <span
-                                        class="price-tag bg-white shadow-lg ms-4"
-                                        ><small>$</small>65.50</span
-                                    >
-
-                                    <div
-                                        class="d-flex flex-wrap align-items-center w-100 mt-2"
-                                    >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            4.4/5
-                                        </h6>
-
-                                        <div class="reviews-stars">
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                        </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            102 Reviews
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-lg-4 col-md-6 col-12">
-                            <div class="menu-thumb">
-                                <img
-                                    src="image/mypersonalsite/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg"
-                                    class="img-fluid menu-image"
-                                    alt=""
-                                />
-
-                                <div
-                                    class="menu-info d-flex flex-wrap align-items-center"
-                                >
-                                    <h4 class="mb-0">Premium Steak</h4>
-
-                                    <span
-                                        class="price-tag bg-white shadow-lg ms-4"
-                                        ><small>$</small>74.25</span
-                                    >
-
-                                    <div
-                                        class="d-flex flex-wrap align-items-center w-100 mt-2"
-                                    >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
-                                        <div class="reviews-stars">
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                        </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            56 Reviews
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="col-lg-4 col-md-6 col-12">
-                            <div class="menu-thumb">
-                                <img
-                                    src="image/mypersonalsite/dinner/farhad-ibrahimzade-isHUj3N0194-unsplash.jpg"
-                                    class="img-fluid menu-image"
-                                    alt=""
-                                />
-
-                                <div
-                                    class="menu-info d-flex flex-wrap align-items-center"
-                                >
-                                    <h4 class="mb-0">Salmon Set</h4>
-
-                                    <span
-                                        class="price-tag bg-white shadow-lg ms-4"
-                                        ><small>$</small>60</span
-                                    >
-
-                                    <div
-                                        class="d-flex flex-wrap align-items-center w-100 mt-2"
-                                    >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
-                                        <div class="reviews-stars">
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i
-                                                class="bi-star-fill reviews-icon"
-                                            ></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                            <i class="bi-star reviews-icon"></i>
-                                        </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            76 Reviews
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </section>
-        </main>
-
-         <footer class="site-footer section-padding">
-            <div class="container">
-                <div class="row">
-                    <div class="col-12">
-                        <h4 class="text-white mb-4 me-5"><?php echo $mysoc->name; ?></h4>
-                    </div>
-
-                    <div class="col-lg-4 col-md-7 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Location</h6>
-
-                        <p><?php echo $mysoc->getFullAddress(); ?></p>
-
-                        <a
-                            href="https://goo.gl/maps/CJ8FfebWZHLQBA2r5"
-                            class="custom-btn btn btn-dark mt-2"
-                            >Directions</a
-                        >
-                    </div>
-
-                    <div class="col-lg-4 col-md-5 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Opening Hours</h6>
-
-         
-                        <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
-                        foreach ($days as $day){
-                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
-                        }
-                        ?>
-
-                        <p>
-                            Tel:
-                            <a href="tel: 010-02-0340" class="tel-link"
-                                ><?php echo $mysoc->phone ?></a
-                            >
-                        </p>
-                    </div>
-
-                    <div class="col-lg-4 col-md-6 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Social</h6>
-
-                        <ul class="social-icon">
-                             <?php foreach($mysoc->socialnetworks as $key => $value) {
-                                print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>';
-                             } ?>
-
-                       
-                        </ul>
-
-                        <p class="copyright-text tooplate-mt60">
-                            Copyright © <?php echo $mysoc->name; ?>
-                        </p>
-                    </div>
-                </div>
-                <!-- row ending -->
-            </div>
-            <!-- container ending -->
-        </footer>
-
-</section>
-
-</body>
-</html>
-<?php // BEGIN PHP
-$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 172);
-// END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page248.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page248.tpl.php
new file mode 100644
index 00000000000..9acf79aaec9
--- /dev/null
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page248.tpl.php
@@ -0,0 +1,113 @@
+<?php // BEGIN PHP
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
+if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
+	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
+} // Not already loaded
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
+ob_start();
+// END PHP ?>
+<html lang="en">
+<head>
+<title>About us</title>
+<meta charset="utf-8">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="robots" content="index, follow" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="keywords" content="" />
+<meta name="title" content="About us" />
+<meta name="description" content="" />
+<meta name="generator" content="Dolibarr 17.0.0-beta (https://www.dolibarr.org)" />
+<meta name="dolibarr:pageid" content="248" />
+<?php if ($website->use_manifest) { print '<link rel="manifest" href="/manifest.json.php" />'."\n"; } ?>
+<!-- Include link to CSS file -->
+<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />
+<!-- Include link to JS file -->
+<script async src="/javascript.js.php"></script>
+<!-- Include HTML header from common file -->
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
+<!-- Include HTML header from page header block -->
+
+</head>
+<!-- File generated by Dolibarr website module editor -->
+<body id="bodywebsite" class="bodywebsite bodywebpage-about">
+<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
+<?php includeContainer('header'); ?>
+
+<section id="mysection1" contenteditable="true">
+        <main>
+
+            <header class="site-header site-about-header">
+                <div class="container">
+                    <div class="row">
+
+                        <div class="col-lg-10 col-12 mx-auto">
+                            <h1 class="text-white">About Us</h1>
+
+                            <strong class="text-white">Get to know us more</strong>
+                        </div>
+
+                    </div>
+                </div>
+
+                <div class="overlay"></div>
+            </header>           
+
+            <section class="about section-padding">
+                <div class="container">
+                    <div class="row">
+
+                        <div class="col-12">
+                            <h2 class="mb-5">Team Members</h2>
+                        </div>
+
+                        <div class="col-lg-4 col-12">
+                            <div class="team-thumb">
+                                <img src="image/aaab/team/matthew-hamilton-tNCH0sKSZbA-unsplash.jpg" class="img-fluid team-image" alt="">
+                                
+                                <div class="team-info">
+                                    <h4 class="mt-3 mb-0">Sophia</h4>
+
+                                    <p>CEO &amp; Founder</p>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-lg-4 col-12 my-lg-0 my-4">
+                            <div class="team-thumb">
+                                <img src="image/aaab/team/nicolas-horn-MTZTGvDsHFY-unsplash.jpg" class="img-fluid team-image" alt="">
+
+                                <h4 class="mt-3 mb-0">Benjamin W.</h4>
+
+                                <p>Restaurant Manager</p>
+                            </div>
+                        </div>
+
+                        <div class="col-lg-4 col-12">
+                            <div class="team-thumb">
+                                <img src="image/aaab/team/rc-cf-FMh5o5m5N9E-unsplash.jpg" class="img-fluid team-image" alt="">
+                                
+                                <h4 class="mt-3 mb-0">Muchen Jack</h4>
+
+                                <p>Senior Chef</p>
+                            </div>
+                        </div>
+
+                    </div>
+                </div>
+            </section>
+            
+        </main>
+
+</section>
+
+
+<?php includeContainer('footer'); ?>
+
+
+</body>
+</html>
+<?php // BEGIN PHP
+$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 248);
+// END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page170.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
similarity index 70%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/page170.tpl.php
rename to htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
index c444ce1292d..8742e231c27 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page170.tpl.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page249.tpl.php
@@ -18,8 +18,8 @@ ob_start();
 <meta name="keywords" content="" />
 <meta name="title" content="Contact us" />
 <meta name="description" content="" />
-<meta name="generator" content="Dolibarr 17.0.0-alpha (https://www.dolibarr.org)" />
-<meta name="dolibarr:pageid" content="170" />
+<meta name="generator" content="Dolibarr 17.0.0-beta (https://www.dolibarr.org)" />
+<meta name="dolibarr:pageid" content="249" />
 <?php if ($website->use_manifest) { print '<link rel="manifest" href="/manifest.json.php" />'."\n"; } ?>
 <!-- Include link to CSS file -->
 <link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />
@@ -34,7 +34,7 @@ ob_start();
 <body id="bodywebsite" class="bodywebsite bodywebpage-contact">
 <!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
 <?php 
-    if (GETPOST('action') == 'sendmail')    {
+if (GETPOST('action') == 'sendmail')    {
     include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
     $from = GETPOST('email', 'alpha');
     $to = $mysoc->email;
@@ -51,67 +51,12 @@ ob_start();
 	}
 }
 ?>
+
+<?php includeContainer('header'); ?>
+
+
 <section id="mysection1" contenteditable="true">
-     <nav class="navbar navbar-expand-lg bg-white shadow-lg">
-            <div class="container">
-                <button
-                    class="navbar-toggler"
-                    type="button"
-                    data-bs-toggle="collapse"
-                    data-bs-target="#navbarNav"
-                    aria-controls="navbarNav"
-                    aria-expanded="false"
-                    aria-label="Toggle navigation"
-                >
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-
-                <a class="navbar-brand" href="index.html"><?php echo $mysoc->name; ?></a>
-
-                <div class="d-lg-none">
-                    <a href="#reservation"
-                        class="custom-btn btn btn-danger"
-                        data-bs-toggle="modal"
-                        data-bs-target="#BookingModal"
-                    >
-                        Reservation
-                    </a>
-                </div>
-
-                <div class="collapse navbar-collapse" id="navbarNav">
-                    <ul class="navbar-nav mx-auto">
-                        <li class="nav-item">
-                            <a class="nav-link" href="index.php">Home</a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="about.php">About</a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="menu.php">Menu</a>
-                        </li>
-                        
-                        <li class="nav-item">
-                            <a class="nav-link active" href="contact.php">Contact</a>
-                        </li>
-                    </ul>
-                </div>
-
-                <div class="d-none d-lg-block">
-                    <a href="#reservation"
-                        type="button"
-                        class="custom-btn btn btn-danger"
-                        data-bs-toggle="modal"
-                        data-bs-target="#BookingModal"
-                    >
-                        Reservation
-                    </a>
-                </div>
-            </div>
-        </nav>
-
-        <main>
+    <main>
             <header class="site-header site-contact-header">
                 <div class="container">
                     <div class="row">
@@ -128,7 +73,7 @@ ob_start();
                 <div class="overlay"></div>
             </header>
 
-            <a id="reservation"></a>
+            <a id="reservation"></a><br>
             
             <section class="contact section-padding">
                 <div class="container">
@@ -144,6 +89,9 @@ ob_start();
                                 method="post"
                                 role="form"
                             >
+                                <input type="hidden" name="action" value="sendmail">
+                                <input type="hidden" name="toekn" value="<?php echo newToken(); ?>">
+                                
                                 <div class="col-lg-6 col-6">
                                     <label for="contact-name" class="form-label"
                                         >Full Name</label
@@ -163,7 +111,7 @@ ob_start();
                                     <label
                                         for="contact-phone"
                                         class="form-label"
-                                        >Phone Number</label
+                                        ><?php echo $weblangs->trans("Phone"); ?></label
                                     >
 
                                     <input
@@ -178,7 +126,7 @@ ob_start();
                                     <label
                                         for="contact-email"
                                         class="form-label"
-                                        >Email</label
+                                        ><?php echo $weblangs->trans("Email"); ?></label
                                     >
 
                                     <input
@@ -194,7 +142,7 @@ ob_start();
                                     <label
                                         for="contact-message"
                                         class="form-label"
-                                        >Message</label
+                                        ><?php echo $weblangs->trans("Message"); ?></label
                                     >
 
                                     <textarea
@@ -208,7 +156,7 @@ ob_start();
 
                                 <div class="col-lg-5 col-12 ms-auto">
                                     <button type="submit" class="form-control">
-                                        Send
+                                        <?php echo $weblangs->trans("Send"); ?>
                                     </button>
                                 </div>
                             </form>
@@ -234,89 +182,25 @@ ob_start();
                             </div>
                         </div>
 
-                        <div class="col-12">
-                            <h4 class="mt-5 mb-4">
+                        <div class="col-12" id="divaddress">
+                            <br><br>
+                        
+                            <h4 class="mt-5 mb-4 center">
                                 <?php echo $mysoc->getFullAddress() ?>
                             </h4>
 
-                            <div class="google-map pt-3">
-                                <iframe
-                                    src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d90596.06698695973!2d-0.7089680200547398!3d44.79859846268479!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0xd54d8fb00b62b4d%3A0x963d0840e2fa1f97!2sPessac%20Centre!5e0!3m2!1sen!2sfr!4v1659970475018!5m2!1sen!2sfr"
-                                    width="100%"
-                                    height="300"
-                                    style="border: 0"
-                                    allowfullscreen=""
-                                    loading="lazy"
-                                    referrerpolicy="no-referrer-when-downgrade"
-                                ></iframe>
+                            <!-- Google MAPS -->
+                            <center><div class="mapouter"><div class="gmap_canvas"><iframe width="600" height="500" id="gmap_canvas" src="https://maps.google.com/maps?q=<?php echo urlencode($mysoc->getFullAddress()); ?>&t=&z=13&ie=UTF8&iwloc=&output=embed" frameborder="0" scrolling="no" marginheight="0" marginwidth="0"></iframe>
                             </div>
+                            <style>.mapouter{text-align:right;height:500px;width:600px;}.gmap_canvas {overflow:hidden;background:none!important;height:500px;width:600px;}</style>
+                            </div></center>
                         </div>
                     </div>
                 </div>
             </section>
         </main>
 
-        <footer class="site-footer section-padding">
-            <div class="container">
-                <div class="row">
-                    <div class="col-12">
-                        <h4 class="text-white mb-4 me-5"><?php echo $mysoc->name; ?></h4>
-                    </div>
 
-                    <div class="col-lg-4 col-md-7 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Location</h6>
-
-                        <p><?php echo $mysoc->getFullAddress(); ?></p>
-
-                        <a
-                            href="https://goo.gl/maps/CJ8FfebWZHLQBA2r5"
-                            class="custom-btn btn btn-dark mt-2"
-                            >Directions</a
-                        >
-                    </div>
-
-                    <div class="col-lg-4 col-md-5 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Opening Hours</h6>
-
-         
-                        <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
-                        foreach ($days as $day){
-                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
-                        }
-                        ?>
-
-                        <p>
-                            Tel:
-                            <a href="tel: 010-02-0340" class="tel-link"
-                                ><?php echo $mysoc->phone ?></a
-                            >
-                        </p>
-                    </div>
-
-                    <div class="col-lg-4 col-md-6 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Social</h6>
-
-                        <ul class="social-icon">
-                             <?php foreach($mysoc->socialnetworks as $key => $value) {
-                                print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>';
-                             } ?>
-
-                       
-                        </ul>
-
-                        <p class="copyright-text tooplate-mt60">
-                            Copyright © <?php echo $mysoc->name; ?>
-                        </p>
-                    </div>
-                </div>
-                <!-- row ending -->
-            </div>
-            <!-- container ending -->
-        </footer>
-        
-        
-        
-        
         
         <!-- Modal -->
         <div
@@ -346,7 +230,7 @@ ob_start();
                             <form
                                 class="booking-form row"
                                 role="form"
-                                action="index.php"
+                                action="contact.php"
                                 method="POST"
                             >
                                 <input type="hidden" name="token" value="<?php echo newToken(); ?>" />
@@ -473,8 +357,12 @@ ob_start();
 
 </section>
 
+
+<?php includeContainer('footer'); ?>
+
+
 </body>
 </html>
 <?php // BEGIN PHP
-$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 170);
+$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 249);
 // END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page171.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page250.tpl.php
similarity index 63%
rename from htdocs/install/doctemplates/websites/website_template-restaurant/containers/page171.tpl.php
rename to htdocs/install/doctemplates/websites/website_template-restaurant/containers/page250.tpl.php
index 79bebfe5359..ed509115c54 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page171.tpl.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page250.tpl.php
@@ -18,8 +18,8 @@ ob_start();
 <meta name="keywords" content="" />
 <meta name="title" content="index" />
 <meta name="description" content="" />
-<meta name="generator" content="Dolibarr 17.0.0-alpha (https://www.dolibarr.org)" />
-<meta name="dolibarr:pageid" content="171" />
+<meta name="generator" content="Dolibarr 17.0.0-beta (https://www.dolibarr.org)" />
+<meta name="dolibarr:pageid" content="250" />
 <?php if ($website->use_manifest) { print '<link rel="manifest" href="/manifest.json.php" />'."\n"; } ?>
 <!-- Include link to CSS file -->
 <link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />
@@ -34,68 +34,10 @@ ob_start();
 <body id="bodywebsite" class="bodywebsite bodywebpage-index">
 <!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
 
+<?php includeContainer('header'); ?>
+
+
 <section id="mysection1" contenteditable="true">
-<nav class="navbar navbar-expand-lg bg-white shadow-lg">
-            <div class="container">
-                <button
-                    class="navbar-toggler"
-                    type="button"
-                    data-bs-toggle="collapse"
-                    data-bs-target="#navbarNav"
-                    aria-controls="navbarNav"
-                    aria-expanded="false"
-                    aria-label="Toggle navigation"
-                >
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-
-                <a class="navbar-brand" href="index.html"><?php echo $mysoc->name; ?></a>
-
-                <div class="d-lg-none">
-                    <a href="contact.php#reservation"
-                        type="button"
-                        class="custom-btn btn btn-danger"
-                        data-bs-toggle="modal"
-                        data-bs-target="#BookingModal"
-                    >
-                        Reservation
-                    </a>
-                </div>
-
-                <div class="collapse navbar-collapse" id="navbarNav">
-                    <ul class="navbar-nav mx-auto">
-                        <li class="nav-item">
-                            <a class="nav-link active" href="index.php"
-                                >Home</a
-                            >
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="about.php">About</a>
-                        </li>
-
-                        <li class="nav-item">
-                            <a class="nav-link" href="menu.php">Menu</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="contact.php">Contact</a>
-                        </li>
-                    </ul>
-                </div>
-
-                <div class="d-none d-lg-block">
-                    <a href="contact.php#reservation"
-                        type="button"
-                        class="custom-btn btn btn-danger"
-                        data-bs-toggle="modal"
-                        data-bs-target="#BookingModal"
-                    >
-                        Reservation
-                    </a>
-                </div>
-            </div>
-        </nav>
-
         <main>
             <section class="hero">
                 <div class="container">
@@ -106,16 +48,9 @@ ob_start();
                                     Delicious Steaks
                                 </h1>
 
-                                <div
-                                    class="c-reviews my-3 d-flex flex-wrap align-items-center"
-                                >
+                                <div class="c-reviews my-3 d-flex flex-wrap align-items-center">
                                     <div
-                                        class="d-flex flex-wrap align-items-center"
-                                    >
-                                        <h4 class="text-white mb-0 me-3">
-                                            4.7/5
-                                        </h4>
-
+                                        class="d-flex flex-wrap align-items-center">
                                         <div class="reviews-stars">
                                             <i
                                                 class="bi-star-fill reviews-icon"
@@ -132,11 +67,6 @@ ob_start();
                                             <i class="bi-star reviews-icon"></i>
                                         </div>
                                     </div>
-
-                                    <p class="text-white w-100">
-                                        From <strong>1,206+</strong> Customer
-                                        Reviews
-                                    </p>
                                 </div>
                             </div>
                         </div>
@@ -151,7 +81,7 @@ ob_start();
                                     <div class="carousel-item active">
                                         <div class="carousel-image-wrap">
                                             <img
-                                                src="image/mypersonalsite/slide/jay-wennington-N_Y88TWmGwA-unsplash.jpg"
+                                                src="image/aaab/slide/jay-wennington-N_Y88TWmGwA-unsplash.jpg"
                                                 class="img-fluid carousel-image"
                                                 alt=""
                                             />
@@ -167,7 +97,7 @@ ob_start();
                                     <div class="carousel-item">
                                         <div class="carousel-image-wrap">
                                             <img
-                                                src="image/mypersonalsite/slide/jason-leung-O67LZfeyYBk-unsplash.jpg"
+                                                src="image/aaab/slide/jason-leung-O67LZfeyYBk-unsplash.jpg"
                                                 class="img-fluid carousel-image"
                                                 alt=""
                                             />
@@ -183,41 +113,13 @@ ob_start();
                                                     >26.50<small>€</small></span
                                                 >
                                             </div>
-
-                                            <div
-                                                class="d-flex flex-wrap align-items-center"
-                                            >
-                                                <h5
-                                                    class="reviews-text mb-0 me-3"
-                                                >
-                                                    3.8/5
-                                                </h5>
-
-                                                <div class="reviews-stars">
-                                                    <i
-                                                        class="bi-star-fill reviews-icon"
-                                                    ></i>
-                                                    <i
-                                                        class="bi-star-fill reviews-icon"
-                                                    ></i>
-                                                    <i
-                                                        class="bi-star-fill reviews-icon"
-                                                    ></i>
-                                                    <i
-                                                        class="bi-star reviews-icon"
-                                                    ></i>
-                                                    <i
-                                                        class="bi-star reviews-icon"
-                                                    ></i>
-                                                </div>
-                                            </div>
                                         </div>
                                     </div>
 
                                     <div class="carousel-item">
                                         <div class="carousel-image-wrap">
                                             <img
-                                                src="image/mypersonalsite/slide/ivan-torres-MQUqbmszGGM-unsplash.jpg"
+                                                src="image/aaab/slide/ivan-torres-MQUqbmszGGM-unsplash.jpg"
                                                 class="img-fluid carousel-image"
                                                 alt=""
                                             />
@@ -235,34 +137,6 @@ ob_start();
                                                     >18.25<small>€</small></span
                                                 >
                                             </div>
-
-                                            <div
-                                                class="d-flex flex-wrap align-items-center"
-                                            >
-                                                <h5
-                                                    class="reviews-text mb-0 me-3"
-                                                >
-                                                    4.2/5
-                                                </h5>
-
-                                                <div class="reviews-stars">
-                                                    <i
-                                                        class="bi-star-fill reviews-icon"
-                                                    ></i>
-                                                    <i
-                                                        class="bi-star-fill reviews-icon"
-                                                    ></i>
-                                                    <i
-                                                        class="bi-star-fill reviews-icon"
-                                                    ></i>
-                                                    <i
-                                                        class="bi-star-fill reviews-icon"
-                                                    ></i>
-                                                    <i
-                                                        class="bi-star reviews-icon"
-                                                    ></i>
-                                                </div>
-                                            </div>
                                         </div>
                                     </div>
                                 </div>
@@ -299,22 +173,6 @@ ob_start();
                     </div>
                 </div>
 
-                <div class="video-wrap">
-                    <video
-                        autoplay=""
-                        loop=""
-                        muted=""
-                        class="custom-video"
-                        poster=""
-                    >
-                        <source
-                            src="image/mypersonalsite/video/production_ID_3769033.mp4"
-                            type="video/mp4"
-                        />
-                        Your browser does not support the video tag.
-                    </video>
-                </div>
-
                 <div class="overlay"></div>
             </section>
 
@@ -331,7 +189,7 @@ ob_start();
                             <div class="menu-thumb">
                                 <div class="menu-image-wrap">
                                     <img
-                                        src="image/mypersonalsite/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg"
+                                        src="image/aaab/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg"
                                         class="img-fluid menu-image"
                                         alt=""
                                     />
@@ -354,10 +212,6 @@ ob_start();
                                     <div
                                         class="d-flex flex-wrap align-items-center w-100 mt-2"
                                     >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            4.3/5
-                                        </h6>
-
                                         <div class="reviews-stars">
                                             <i
                                                 class="bi-star-fill reviews-icon"
@@ -373,10 +227,6 @@ ob_start();
                                             ></i>
                                             <i class="bi-star reviews-icon"></i>
                                         </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            102 Reviews
-                                        </p>
                                     </div>
                                 </div>
                             </div>
@@ -386,7 +236,7 @@ ob_start();
                             <div class="menu-thumb">
                                 <div class="menu-image-wrap">
                                     <img
-                                        src="image/mypersonalsite/lunch/farhad-ibrahimzade-MGKqxm6u2bc-unsplash.jpg"
+                                        src="image/aaab/lunch/farhad-ibrahimzade-MGKqxm6u2bc-unsplash.jpg"
                                         class="img-fluid menu-image"
                                         alt=""
                                     />
@@ -409,10 +259,6 @@ ob_start();
                                     <div
                                         class="d-flex flex-wrap align-items-center w-100 mt-2"
                                     >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
                                         <div class="reviews-stars">
                                             <i
                                                 class="bi-star-fill reviews-icon"
@@ -426,10 +272,6 @@ ob_start();
                                             <i class="bi-star reviews-icon"></i>
                                             <i class="bi-star reviews-icon"></i>
                                         </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            50 Reviews
-                                        </p>
                                     </div>
                                 </div>
                             </div>
@@ -439,7 +281,7 @@ ob_start();
                             <div class="menu-thumb">
                                 <div class="menu-image-wrap">
                                     <img
-                                        src="image/mypersonalsite/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg"
+                                        src="image/aaab/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg"
                                         class="img-fluid menu-image"
                                         alt=""
                                     />
@@ -462,10 +304,6 @@ ob_start();
                                     <div
                                         class="d-flex flex-wrap align-items-center w-100 mt-2"
                                     >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
                                         <div class="reviews-stars">
                                             <i
                                                 class="bi-star-fill reviews-icon"
@@ -479,10 +317,6 @@ ob_start();
                                             <i class="bi-star reviews-icon"></i>
                                             <i class="bi-star reviews-icon"></i>
                                         </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            86 Reviews
-                                        </p>
                                     </div>
                                 </div>
                             </div>
@@ -492,7 +326,7 @@ ob_start();
                             <div class="menu-thumb">
                                 <div class="menu-image-wrap">
                                     <img
-                                        src="image/mypersonalsite/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg"
+                                        src="image/aaab/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg"
                                         class="img-fluid menu-image"
                                         alt=""
                                     />
@@ -515,10 +349,6 @@ ob_start();
                                     <div
                                         class="d-flex flex-wrap align-items-center w-100 mt-2"
                                     >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
                                         <div class="reviews-stars">
                                             <i
                                                 class="bi-star-fill reviews-icon"
@@ -532,10 +362,6 @@ ob_start();
                                             <i class="bi-star reviews-icon"></i>
                                             <i class="bi-star reviews-icon"></i>
                                         </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            44 Reviews
-                                        </p>
                                     </div>
                                 </div>
                             </div>
@@ -545,7 +371,7 @@ ob_start();
                             <div class="menu-thumb">
                                 <div class="menu-image-wrap">
                                     <img
-                                        src="image/mypersonalsite/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg"
+                                        src="image/aaab/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg"
                                         class="img-fluid menu-image"
                                         alt=""
                                     />
@@ -568,10 +394,6 @@ ob_start();
                                     <div
                                         class="d-flex flex-wrap align-items-center w-100 mt-2"
                                     >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            4.3/5
-                                        </h6>
-
                                         <div class="reviews-stars">
                                             <i
                                                 class="bi-star-fill reviews-icon"
@@ -587,10 +409,6 @@ ob_start();
                                             ></i>
                                             <i class="bi-star reviews-icon"></i>
                                         </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            102 Reviews
-                                        </p>
                                     </div>
                                 </div>
                             </div>
@@ -600,7 +418,7 @@ ob_start();
                             <div class="menu-thumb">
                                 <div class="menu-image-wrap">
                                     <img
-                                        src="image/mypersonalsite/lunch/farhad-ibrahimzade-D5c9ZciQy_I-unsplash.jpg"
+                                        src="image/aaab/lunch/farhad-ibrahimzade-D5c9ZciQy_I-unsplash.jpg"
                                         class="img-fluid menu-image"
                                         alt=""
                                     />
@@ -623,10 +441,6 @@ ob_start();
                                     <div
                                         class="d-flex flex-wrap align-items-center w-100 mt-2"
                                     >
-                                        <h6 class="reviews-text mb-0 me-3">
-                                            3/5
-                                        </h6>
-
                                         <div class="reviews-stars">
                                             <i
                                                 class="bi-star-fill reviews-icon"
@@ -640,10 +454,6 @@ ob_start();
                                             <i class="bi-star reviews-icon"></i>
                                             <i class="bi-star reviews-icon"></i>
                                         </div>
-
-                                        <p class="reviews-text mb-0 ms-4">
-                                            64 Reviews
-                                        </p>
                                     </div>
                                 </div>
                             </div>
@@ -653,68 +463,13 @@ ob_start();
             </section>
         </main>
 
-        <footer class="site-footer section-padding">
-            <div class="container">
-                <div class="row">
-                    <div class="col-12">
-                        <h4 class="text-white mb-4 me-5"><?php echo $mysoc->name; ?></h4>
-                    </div>
-
-                    <div class="col-lg-4 col-md-7 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Location</h6>
-
-                        <p><?php echo $mysoc->getFullAddress(); ?></p>
-
-                        <a
-                            href="https://goo.gl/maps/CJ8FfebWZHLQBA2r5"
-                            class="custom-btn btn btn-dark mt-2"
-                            >Directions</a
-                        >
-                    </div>
-
-                    <div class="col-lg-4 col-md-5 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Opening Hours</h6>
-
-         
-                        <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
-                        foreach ($days as $day){
-                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
-                        }
-                        ?>
-
-                        <p>
-                            Tel:
-                            <a href="tel: 010-02-0340" class="tel-link"
-                                ><?php echo $mysoc->phone ?></a
-                            >
-                        </p>
-                    </div>
-
-                    <div class="col-lg-4 col-md-6 col-xs-12 tooplate-mt30">
-                        <h6 class="text-white mb-lg-4 mb-3">Social</h6>
-
-                        <ul class="social-icon">
-                             <?php foreach($mysoc->socialnetworks as $key => $value) {
-                                print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>';
-                             } ?>
-
-                       
-                        </ul>
-
-                        <p class="copyright-text tooplate-mt60">
-                            Copyright © <?php echo $mysoc->name; ?>
-                        </p>
-                    </div>
-                </div>
-                <!-- row ending -->
-            </div>
-            <!-- container ending -->
-        </footer>
-
 </section>
 
+
+<?php includeContainer('footer'); ?>
+
 </body>
 </html>
 <?php // BEGIN PHP
-$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 171);
+$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 250);
 // END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page251.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page251.tpl.php
new file mode 100644
index 00000000000..50fb446dd2e
--- /dev/null
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page251.tpl.php
@@ -0,0 +1,273 @@
+<?php // BEGIN PHP
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
+if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
+	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
+} // Not already loaded
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
+ob_start();
+// END PHP ?>
+<html lang="en">
+<head>
+<title>Our menus</title>
+<meta charset="utf-8">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="robots" content="index, follow" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="keywords" content="" />
+<meta name="title" content="Our menus" />
+<meta name="description" content="" />
+<meta name="generator" content="Dolibarr 17.0.0-beta (https://www.dolibarr.org)" />
+<meta name="dolibarr:pageid" content="251" />
+<?php if ($website->use_manifest) { print '<link rel="manifest" href="/manifest.json.php" />'."\n"; } ?>
+<!-- Include link to CSS file -->
+<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />
+<!-- Include link to JS file -->
+<script async src="/javascript.js.php"></script>
+<!-- Include HTML header from common file -->
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
+<!-- Include HTML header from page header block -->
+
+</head>
+<!-- File generated by Dolibarr website module editor -->
+<body id="bodywebsite" class="bodywebsite bodywebpage-menu">
+<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
+
+<?php includeContainer('header'); ?>
+
+
+<section id="mysection1" contenteditable="true">
+        <main>
+            <header class="site-header site-menu-header">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-lg-10 col-12 mx-auto">
+                            <h1 class="text-white">Our Menus</h1>
+
+                            <strong class="text-white"
+                                >Perfect for all Breakfast, Lunch and
+                                Dinner</strong
+                            >
+                        </div>
+                    </div>
+                </div>
+
+                <div class="overlay"></div>
+            </header>
+
+            <section class="menu section-padding">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-12">
+                            <h2 class="mb-lg-5 mb-4">Breakfast Menu</h2>
+                        </div>
+
+                        <div class="col-lg-4 col-md-6 col-12">
+                            <div class="menu-thumb">
+                                <img
+                                    src="image/aaab/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg"
+                                    class="img-fluid menu-image"
+                                    alt=""
+                                />
+
+                                <div
+                                    class="menu-info d-flex flex-wrap align-items-center"
+                                >
+                                    <h4 class="mb-0">Fresh Start</h4>
+
+                                    <span
+                                        class="price-tag bg-white shadow-lg ms-4"
+                                        ><small>$</small>24.50</span
+                                    >
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-lg-4 col-md-6 col-12">
+                            <div class="menu-thumb">
+                                <img
+                                    src="/image/aaab/breakfast/lucas-swennen-1W_MyJSRLuQ-unsplash.jpg"
+                                    class="img-fluid menu-image"
+                                    alt=""
+                                />
+
+                                <div
+                                    class="menu-info d-flex flex-wrap align-items-center"
+                                >
+                                    <h4 class="mb-0">Baked Creamy</h4>
+
+                                    <span
+                                        class="price-tag bg-white shadow-lg ms-4"
+                                        ><small>$</small>16.50</span
+                                    >
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-lg-4 col-md-6 col-12">
+                            <div class="menu-thumb">
+                                <img
+                                    src="image/aaab/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg"
+                                    class="img-fluid menu-image"
+                                    alt=""
+                                />
+
+                                <div
+                                    class="menu-info d-flex flex-wrap align-items-center"
+                                >
+                                    <h4 class="mb-0">Burger Set</h4>
+
+                                    <span
+                                        class="price-tag bg-white shadow-lg ms-4"
+                                        ><small>$</small>24.50</span
+                                    >
+
+                                    <del class="ms-4"
+                                        ><small>$</small>36.50</del
+                                    >
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </section>
+
+            <section class="menu section-padding bg-white">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-12">
+                            <h2 class="mb-lg-5 mb-4">Lunch Menu</h2>
+                        </div>
+
+                        <div class="col-lg-6 col-12">
+                            <div class="menu-thumb">
+                                <img
+                                    src="image/aaab/lunch/louis-hansel-cH5IPjaAYyo-unsplash.jpg"
+                                    class="img-fluid menu-image"
+                                    alt=""
+                                />
+
+                                <div
+                                    class="menu-info d-flex flex-wrap align-items-center"
+                                >
+                                    <h4 class="mb-0">Super Steak Set</h4>
+
+                                    <span
+                                        class="price-tag bg-white shadow-lg ms-4"
+                                        ><small>$</small>32.75</span
+                                    >
+
+                                    <del class="ms-4"><small>$</small>55</del>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-lg-6 col-12">
+                            <div class="menu-thumb">
+                                <img
+                                    src="image/aaab/lunch/louis-hansel-rheOvfxOlOA-unsplash.jpg"
+                                    class="img-fluid menu-image"
+                                    alt=""
+                                />
+
+                                <div
+                                    class="menu-info d-flex flex-wrap align-items-center"
+                                >
+                                    <h4 class="mb-0">Bread &amp; Steak Set</h4>
+
+                                    <span
+                                        class="price-tag bg-white shadow-lg ms-4"
+                                        ><small>$</small>42.50</span
+                                    >
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </section>
+
+            <section class="menu section-padding">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-12">
+                            <h2 class="mb-lg-5 mb-4">Dinner Menu</h2>
+                        </div>
+
+                        <div class="col-lg-4 col-md-6 col-12">
+                            <div class="menu-thumb">
+                                <img
+                                    src="image/aaab/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg"
+                                    class="img-fluid menu-image"
+                                    alt=""
+                                />
+
+                                <div
+                                    class="menu-info d-flex flex-wrap align-items-center"
+                                >
+                                    <h4 class="mb-0">Seafood Set</h4>
+
+                                    <span
+                                        class="price-tag bg-white shadow-lg ms-4"
+                                        ><small>$</small>65.50</span
+                                    >
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-lg-4 col-md-6 col-12">
+                            <div class="menu-thumb">
+                                <img
+                                    src="image/aaab/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg"
+                                    class="img-fluid menu-image"
+                                    alt=""
+                                />
+
+                                <div
+                                    class="menu-info d-flex flex-wrap align-items-center"
+                                >
+                                    <h4 class="mb-0">Premium Steak</h4>
+
+                                    <span
+                                        class="price-tag bg-white shadow-lg ms-4"
+                                        ><small>$</small>74.25</span
+                                    >
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="col-lg-4 col-md-6 col-12">
+                            <div class="menu-thumb">
+                                <img
+                                    src="image/aaab/dinner/farhad-ibrahimzade-isHUj3N0194-unsplash.jpg"
+                                    class="img-fluid menu-image"
+                                    alt=""
+                                />
+
+                                <div
+                                    class="menu-info d-flex flex-wrap align-items-center"
+                                >
+                                    <h4 class="mb-0">Salmon Set</h4>
+
+                                    <span
+                                        class="price-tag bg-white shadow-lg ms-4"
+                                        ><small>$</small>60</span
+                                    >
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </section>
+        </main>
+
+</section>
+
+
+<?php includeContainer('footer'); ?>
+
+</body>
+</html>
+<?php // BEGIN PHP
+$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 251);
+// END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page252.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page252.tpl.php
new file mode 100644
index 00000000000..568a538488b
--- /dev/null
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page252.tpl.php
@@ -0,0 +1,93 @@
+<?php // BEGIN PHP
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
+if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
+	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
+} // Not already loaded
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
+ob_start();
+// END PHP ?>
+<html lang="en">
+<head>
+<title>Footer</title>
+<meta charset="utf-8">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="robots" content="index, follow" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="keywords" content="" />
+<meta name="title" content="Footer" />
+<meta name="description" content="" />
+<meta name="generator" content="Dolibarr 17.0.0-beta (https://www.dolibarr.org)" />
+<meta name="dolibarr:pageid" content="252" />
+<?php if ($website->use_manifest) { print '<link rel="manifest" href="/manifest.json.php" />'."\n"; } ?>
+<!-- Include link to CSS file -->
+<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />
+<!-- Include link to JS file -->
+<script async src="/javascript.js.php"></script>
+<!-- Include HTML header from common file -->
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
+<!-- Include HTML header from page header block -->
+
+</head>
+<!-- File generated by Dolibarr website module editor -->
+<body id="bodywebsite" class="bodywebsite bodywebpage-footer">
+<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable="true" if you want to use the inline editor for the content  -->
+<section id="footer" contenteditable="true">
+            <!-- Footer -->
+        <footer class="site-footer section-padding">
+            <div class="container">
+                <div class="row">
+                    <div class="col-lg-4 col-md-7 col-xs-12 tooplate-mt30">
+                        <h6 class="text-white mb-lg-4 mb-3"><?php echo $weblangs->trans("Location"); ?></h6>
+
+                        <p><?php echo $mysoc->getFullAddress(); ?></p>
+
+                        <a href="contact.php#divaddress" class="custom-btn btn btn-dark mt-2"><?php echo $weblangs->trans("Map"); ?></a>
+                    </div>
+
+                    <div class="col-lg-4 col-md-5 col-xs-12 tooplate-mt30">
+                        <h6 class="text-white mb-lg-4 mb-3">Opening Hours</h6>
+
+         
+                        <?php $days = ["MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY"];
+                        foreach ($days as $day){
+                            echo "<p> $day : " .getDolGlobalString("MAIN_INFO_OPENINGHOURS_$day")  ."</p>";    
+                        }
+                        ?>
+
+                        <p>
+                            Tel:
+                            <a href="tel: <?php echo $mysoc->phone ?>" class="tel-link"
+                                ><?php echo $mysoc->phone ?></a
+                            >
+                        </p>
+                    </div>
+
+                    <div class="col-lg-4 col-md-6 col-xs-12 tooplate-mt30">
+                        <h6 class="text-white mb-lg-4 mb-3">Social</h6>
+
+                        <ul class="social-icon">
+                             <?php foreach($mysoc->socialnetworks as $key => $value) {
+                                print '<li> <a class="btn btn-perso2 btn-floating m-1" href="'. (preg_match('/^http/', $value) ? $value : 'https://www.'.$key.'.com/'.$value).'"><span class="fab fa-'.$key.'"></i></a> </li>';
+                             } ?>
+
+                       
+                        </ul>
+
+                        <p class="copyright-text tooplate-mt60">
+                            Copyright © <?php echo $mysoc->name; ?>
+                        </p>
+                    </div>
+                </div>
+                <!-- row ending -->
+            </div>
+            <!-- container ending -->
+        </footer>
+</section>
+
+</body>
+</html>
+<?php // BEGIN PHP
+$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 252);
+// END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page253.tpl.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page253.tpl.php
new file mode 100644
index 00000000000..10896678ceb
--- /dev/null
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/page253.tpl.php
@@ -0,0 +1,98 @@
+<?php // BEGIN PHP
+$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;
+if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) {
+	$pathdepth = count(explode('/', $_SERVER['SCRIPT_NAME'])) - 2;
+	require_once ($pathdepth ? str_repeat('../', $pathdepth) : './').'master.inc.php';
+} // Not already loaded
+require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';
+ob_start();
+// END PHP ?>
+<html lang="en">
+<head>
+<title>Header</title>
+<meta charset="utf-8">
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<meta name="robots" content="index, follow" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="keywords" content="" />
+<meta name="title" content="Header" />
+<meta name="description" content="" />
+<meta name="generator" content="Dolibarr 17.0.0-beta (https://www.dolibarr.org)" />
+<meta name="dolibarr:pageid" content="253" />
+<?php if ($website->use_manifest) { print '<link rel="manifest" href="/manifest.json.php" />'."\n"; } ?>
+<!-- Include link to CSS file -->
+<link rel="stylesheet" href="/styles.css.php?website=<?php echo $websitekey; ?>" type="text/css" />
+<!-- Include link to JS file -->
+<script async src="/javascript.js.php"></script>
+<!-- Include HTML header from common file -->
+<?php if (file_exists(DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html")) include DOL_DATA_ROOT."/website/".$websitekey."/htmlheader.html"; ?>
+<!-- Include HTML header from page header block -->
+
+</head>
+<!-- File generated by Dolibarr website module editor -->
+<body id="bodywebsite" class="bodywebsite bodywebpage-header">
+<section id="header" contenteditable="true">
+    <nav class="navbar navbar-expand-lg bg-white shadow-lg">
+            <div class="container">
+                <button
+                    class="navbar-toggler"
+                    type="button"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#navbarNav"
+                    aria-controls="navbarNav"
+                    aria-expanded="false"
+                    aria-label="Toggle navigation"
+                >
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+
+                <a class="navbar-brand" href="index.html"><?php echo $mysoc->name; ?></a>
+
+                <div class="d-lg-none">
+                    <a href="contact.php#reservation"
+                        type="button"
+                        class="custom-btn btn btn-danger"
+                        data-bs-toggle="modal"
+                        data-bs-target="#BookingModal"
+                    ><?php $langs->trans("Reservation"); ?></a>
+                </div>
+
+                <div class="collapse navbar-collapse" id="navbarNav">
+                    <ul class="navbar-nav mx-auto">
+                        <li class="nav-item">
+                            <a class="nav-link<?php echo ($websitepage->ref == 'index' ? ' active' : ''); ?>" href="index.php"><?php echo $weblangs->trans("Home"); ?></a>
+                        </li>
+
+                        <li class="nav-item">
+                            <a class="nav-link<?php echo ($websitepage->ref == 'about' ? ' active' : ''); ?>" href="about.php"><?php echo $weblangs->trans("About"); ?></a>
+                        </li>
+
+                        <li class="nav-item">
+                            <a class="nav-link<?php echo ($websitepage->ref == 'menu' ? ' active' : ''); ?>" href="menu.php"><?php echo $weblangs->trans("Menu"); ?></a>
+                        </li>
+                        
+                        <li class="nav-item">
+                            <a class="nav-link<?php echo ($websitepage->ref == 'contact' ? ' active' : ''); ?>" href="contact.php"><?php echo $weblangs->trans("Contact"); ?></a>
+                        </li>
+                    </ul>
+                </div>
+
+                <div class="d-none d-lg-block">
+                    <a href="contact.php#reservation"
+                        type="button"
+                        class="custom-btn btn btn-danger"
+                        data-bs-toggle="modal"
+                        data-bs-target="#BookingModal"
+                    ><?php echo $weblangs->trans("Reservation"); ?></a>
+                </div>
+            </div>
+    </nav>
+</section>
+
+
+</body>
+</html>
+<?php // BEGIN PHP
+$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "html", 253);
+// END PHP ?>
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/styles.css.php b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/styles.css.php
index d945f011dda..0c669a21a69 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/containers/styles.css.php
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/containers/styles.css.php
@@ -11,44 +11,6 @@ header('Content-type: text/css');
 // END PHP ?>
 @charset "UTF-8";
 
-.bodywebsite {
-  /*!
- * Bootstrap  v5.2.1 (https://getbootstrap.com/)
- * Copyright 2011-2022 The Bootstrap Authors
- * Copyright 2011-2022 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- */
-  /* rtl:raw:
-[type="tel"],
-[type="url"],
-[type="email"],
-[type="number"] {
-  direction: ltr;
-}
-*/
-  /* rtl:begin:ignore */
-  /* rtl:end:ignore */
-  /* rtl:begin:ignore */
-  /* rtl:end:ignore */
-  /* rtl:begin:ignore */
-  /* rtl:end:ignore */
-  /* rtl:begin:ignore */
-  /* rtl:end:ignore */
-  /* rtl:begin:ignore */
-  /* rtl:end:ignore */
-  /* rtl:options: {
-  "autoRename": true,
-  "stringMap":[ {
-    "name"    : "prev-next",
-    "search"  : "prev",
-    "replace" : "next"
-  } ]
-} */
-  /* rtl:begin:remove */
-  /* rtl:end:remove */
-  /*# sourceMappingURL=bootstrap.css.map */;
-}
-
 .bodywebsite :root {
 	--bs-blue: #0d6efd;
 	--bs-indigo: #6610f2;
@@ -143,6 +105,10 @@ header('Content-type: text/css');
 	-webkit-tap-highlight-color: transparent;
 }
 
+.bodywebsite .center {
+    text-align: center;
+}
+
 .bodywebsite hr {
 	margin: 1rem 0;
 	color: inherit;
@@ -8367,6 +8333,7 @@ header('Content-type: text/css');
 
 .bodywebsite .m-1 {
 	margin: 0.25rem !important;
+	padding-left: 0px !important;
 }
 
 .bodywebsite .m-2 {
@@ -12596,8 +12563,8 @@ body.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }
 }
 
 .bodywebsite .section-padding {
-    padding-top: 8rem;
-    padding-bottom: 8rem;
+    padding-top: 6rem;
+    padding-bottom: 6rem;
 }
 
 .bodywebsite b,
@@ -13019,8 +12986,8 @@ body.bodywebsite { margin: 0; font-family: 'Open Sans', sans-serif; }
     background-repeat: no-repeat;
     background-position: center;
     background-size: cover;
-    padding-top: 7rem;
-    padding-bottom: 7rem;
+    padding-top: 3rem;
+    padding-bottom: 3rem;
     position: relative;
 }
 
diff --git a/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql b/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql
index 822117f86cb..f088e50d33e 100644
--- a/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql
+++ b/htdocs/install/doctemplates/websites/website_template-restaurant/website_pages.sql
@@ -1,16 +1,22 @@
--- File generated by Dolibarr 17.0.0-alpha -- 2022-10-08 18:18:50 UTC --;
--- Page ID 169 -> 1__+MAX_llx_website_page__ - Aliases about --;
-INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(1__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'about', '', 'About us', '', '', '', '', '1', '2022-08-09 16:40:13', '2022-10-08 19:22:45', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<section id=\"mysection1\" contenteditable=\"true\">__N__    <nav class=\"navbar navbar-expand-lg bg-white shadow-lg\">__N__            <div class=\"container\">__N__                <button__N__                    class=\"navbar-toggler\"__N__                    type=\"button\"__N__                    data-bs-toggle=\"collapse\"__N__                    data-bs-target=\"#navbarNav\"__N__                    aria-controls=\"navbarNav\"__N__                    aria-expanded=\"false\"__N__                    aria-label=\"Toggle navigation\"__N__                >__N__                    <span class=\"navbar-toggler-icon\"></span>__N__                </button>__N____N__                <a class=\"navbar-brand\" href=\"index.html\"><?php echo $mysoc->name; ?></a>__N____N__                <div class=\"d-lg-none\">__N__                    <a href=\"contact.php#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    >__N__                        Reservation__N__                    </a>__N__                </div>__N____N__                <div class=\"collapse navbar-collapse\" id=\"navbarNav\">__N__                    <ul class=\"navbar-nav mx-auto\">__N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"index.php\">Home</a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link active\" href=\"about.php\">About</a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"menu.php\">Menu</a>__N__                        </li>__N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"contact.php\">Contact</a>__N__                        </li>__N__                    </ul>__N__                </div>__N____N__                <div class=\"d-none d-lg-block\">__N__                    <a href=\"contact.php#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    >__N__                        Reservation__N__                    </a>__N__                </div>__N__            </div>__N__        </nav>__N____N__        <main>__N____N__            <header class=\"site-header site-about-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N____N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">About Us</h1>__N____N__                            <strong class=\"text-white\">Get to know us more</strong>__N__                        </div>__N____N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>           __N____N__            <section class=\"about section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N____N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-5\">Team Members</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/matthew-hamilton-tNCH0sKSZbA-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N__                                __N__                                <div class=\"team-info\">__N__                                    <h4 class=\"mt-3 mb-0\">Sophia</h4>__N____N__                                    <p>CEO &amp; Founder</p>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12 my-lg-0 my-4\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/nicolas-horn-MTZTGvDsHFY-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N____N__                                <h4 class=\"mt-3 mb-0\">Benjamin W.</h4>__N____N__                                <p>Restaurant Manager</p>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/rc-cf-FMh5o5m5N9E-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N__                                __N__                                <h4 class=\"mt-3 mb-0\">Muchen Jack</h4>__N____N__                                <p>Senior Chef</p>__N__                            </div>__N__                        </div>__N____N__                    </div>__N__                </div>__N__            </section>__N__            __N__            __N__            <!--__N__            <section class=\"newsletter section-padding bg-white\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <img src=\"image/__WEBSITE_KEY__/charles-deluvio-FdDkfYFHqe4-unsplash.jpg\" class=\"img-fluid newsletter-image\" alt=\"\">__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12 d-flex align-items-center mt-5 mt-lg-0 mx-auto\">__N__                            <div class=\"subscribe-form-wrap\">__N__                                <h4 class=\"mb-0\">Our Newsletter</h4>__N____N__                                <p>The food news every day</p>__N____N__                                <form class=\"custom-form subscribe-form mt-4\" role=\"form\">__N__                                    <input type=\"email\" name=\"subscribe-email\" id=\"subscribe-email\" pattern=\"[^ @]*@[^ @]*\" class=\"form-control\" placeholder=\"Your email address\" required=\"\">__N____N__                                    <button type=\"submit\" class=\"form-control mb-3\" id=\"subscribe\">Subscribe</button>__N____N__                                    <small>By signing up, you agree to our Privacy Notice and the data policy</small>__N__                                    </div>__N__                                </form>__N__                            </div>__N__                        </div>__N____N__                    </div>__N__                </div>__N__            </section>__N__            -->__N__            __N__        </main>__N____N__</section>__N__', '', 0);
--- File generated by Dolibarr 17.0.0-alpha -- 2022-10-08 18:18:50 UTC --;
--- Page ID 170 -> 2__+MAX_llx_website_page__ - Aliases contact --;
-INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(2__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'contact', '', 'Contact us', '', '', '', '', '1', '2022-08-16 14:40:51', '2022-10-08 19:30:28', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<?php __N__    if (GETPOST(\'action\') == \'sendmail\')    {__N__    include_once DOL_DOCUMENT_ROOT.\'/core/class/CMailFile.class.php\';__N__    $from = GETPOST(\'email\', \'alpha\');__N__    $to = $mysoc->email;__N__    $message = GETPOST(\'message\', \'alpha\');__N__    $cmail = new CMailFile(\'Contact from website\', $to, $from, $message);__N__    if ($cmail->sendfile()) {__N__        ?>__N__        <script>__N__            alert(\"Message sent successfully !\");__N__        </script>__N__        <?php__N__	} else {__N__		echo $langs->trans(\"ErrorFailedToSendMail\", $from, $to).\'. \'.$cmail->error;__N__	}__N__}__N__?>__N__<section id=\"mysection1\" contenteditable=\"true\">__N__     <nav class=\"navbar navbar-expand-lg bg-white shadow-lg\">__N__            <div class=\"container\">__N__                <button__N__                    class=\"navbar-toggler\"__N__                    type=\"button\"__N__                    data-bs-toggle=\"collapse\"__N__                    data-bs-target=\"#navbarNav\"__N__                    aria-controls=\"navbarNav\"__N__                    aria-expanded=\"false\"__N__                    aria-label=\"Toggle navigation\"__N__                >__N__                    <span class=\"navbar-toggler-icon\"></span>__N__                </button>__N____N__                <a class=\"navbar-brand\" href=\"index.html\"><?php echo $mysoc->name; ?></a>__N____N__                <div class=\"d-lg-none\">__N__                    <a href=\"#reservation\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    >__N__                        Reservation__N__                    </a>__N__                </div>__N____N__                <div class=\"collapse navbar-collapse\" id=\"navbarNav\">__N__                    <ul class=\"navbar-nav mx-auto\">__N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"index.php\">Home</a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"about.php\">About</a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"menu.php\">Menu</a>__N__                        </li>__N__                        __N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link active\" href=\"contact.php\">Contact</a>__N__                        </li>__N__                    </ul>__N__                </div>__N____N__                <div class=\"d-none d-lg-block\">__N__                    <a href=\"#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    >__N__                        Reservation__N__                    </a>__N__                </div>__N__            </div>__N__        </nav>__N____N__        <main>__N__            <header class=\"site-header site-contact-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">Say Hi</h1>__N____N__                            <strong class=\"text-white\"__N__                                >We are happy to get in touch with you</strong__N__                            >__N__                        </div>__N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>__N____N__            <a id=\"reservation\"></a>__N__            __N__            <section class=\"contact section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-4\">Leave a message</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <form__N__                                class=\"custom-form contact-form row\"__N__                                action=\"#\"__N__                                method=\"post\"__N__                                role=\"form\"__N__                            >__N__                                <div class=\"col-lg-6 col-6\">__N__                                    <label for=\"contact-name\" class=\"form-label\"__N__                                        >Full Name</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"contact-name\"__N__                                        id=\"contact-name\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Name\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-6\">__N__                                    <label__N__                                        for=\"contact-phone\"__N__                                        class=\"form-label\"__N__                                        >Phone Number</label__N__                                    >__N____N__                                    <input__N__                                        type=\"telephone\"__N__                                        name=\"contact-phone\"__N__                                        id=\"contact-phone\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-12\">__N__                                    <label__N__                                        for=\"contact-email\"__N__                                        class=\"form-label\"__N__                                        >Email</label__N__                                    >__N____N__                                    <input__N__                                        type=\"email\"__N__                                        name=\"contact-email\"__N__                                        id=\"contact-email\"__N__                                        pattern=\"[^ @]*@[^ @]*\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Email\"__N__                                        required=\"\"__N__                                    />__N____N__                                    <label__N__                                        for=\"contact-message\"__N__                                        class=\"form-label\"__N__                                        >Message</label__N__                                    >__N____N__                                    <textarea__N__                                        class=\"form-control\"__N__                                        rows=\"5\"__N__                                        id=\"contact-message\"__N__                                        name=\"contact-message\"__N__                                        placeholder=\"Your Message\"__N__                                    ></textarea>__N__                                </div>__N____N__                                <div class=\"col-lg-5 col-12 ms-auto\">__N__                                    <button type=\"submit\" class=\"form-control\">__N__                                        Send__N__                                    </button>__N__                                </div>__N__                            </form>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12 mx-auto mt-lg-5 mt-4\">__N__                            <h5>Weekdays</h5>__N____N__                            <div class=\" mb-lg-3\">__N__                                 <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                                   foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N__                            </div>__N____N__                            <h5>Weekends</h5>__N____N__                            <div class=\"d-flex\">__N__                                <p>Saturday and Sunday</p>__N____N__                                <p class=\"ms-5\">to be determined !</p>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-12\">__N__                            <h4 class=\"mt-5 mb-4\">__N__                                <?php echo $mysoc->getFullAddress() ?>__N__                            </h4>__N____N__                            <div class=\"google-map pt-3\">__N__                                <iframe__N__                                    src=\"https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d90596.06698695973!2d-0.7089680200547398!3d44.79859846268479!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0xd54d8fb00b62b4d%3A0x963d0840e2fa1f97!2sPessac%20Centre!5e0!3m2!1sen!2sfr!4v1659970475018!5m2!1sen!2sfr\"__N__                                    width=\"100%\"__N__                                    height=\"300\"__N__                                    style=\"border: 0\"__N__                                    allowfullscreen=\"\"__N__                                    loading=\"lazy\"__N__                                    referrerpolicy=\"no-referrer-when-downgrade\"__N__                                ></iframe>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N__        </main>__N____N__        <footer class=\"site-footer section-padding\">__N__            <div class=\"container\">__N__                <div class=\"row\">__N__                    <div class=\"col-12\">__N__                        <h4 class=\"text-white mb-4 me-5\"><?php echo $mysoc->name; ?></h4>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-7 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Location</h6>__N____N__                        <p><?php echo $mysoc->getFullAddress(); ?></p>__N____N__                        <a__N__                            href=\"https://goo.gl/maps/CJ8FfebWZHLQBA2r5\"__N__                            class=\"custom-btn btn btn-dark mt-2\"__N__                            >Directions</a__N__                        >__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-5 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Opening Hours</h6>__N____N__         __N__                        <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                        foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N____N__                        <p>__N__                            Tel:__N__                            <a href=\"tel: 010-02-0340\" class=\"tel-link\"__N__                                ><?php echo $mysoc->phone ?></a__N__                            >__N__                        </p>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-6 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Social</h6>__N____N__                        <ul class=\"social-icon\">__N__                             <?php foreach($mysoc->socialnetworks as $key => $value) {__N__                                print \'<li> <a class=\"btn btn-perso2 btn-floating m-1\" href=\"\'. (preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\"></i></a> </li>\';__N__                             } ?>__N____N__                       __N__                        </ul>__N____N__                        <p class=\"copyright-text tooplate-mt60\">__N__                            Copyright © <?php echo $mysoc->name; ?>__N__                        </p>__N__                    </div>__N__                </div>__N__                <!-- row ending -->__N__            </div>__N__            <!-- container ending -->__N__        </footer>__N__        __N__        __N__        __N__        __N__        __N__        <!-- Modal -->__N__        <div__N__            class=\"modal fade\"__N__            id=\"BookingModal\"__N__            tabindex=\"-1\"__N__            aria-labelledby=\"BookingModal\"__N__            aria-hidden=\"true\"__N__        >__N__            <div class=\"modal-dialog modal-dialog-centered modal-xl\">__N__                <div class=\"modal-content\">__N__                    <div class=\"modal-header\">__N__                        <h3 class=\"mb-0\">Reserve a table</h3>__N____N__                        <button__N__                            type=\"button\"__N__                            class=\"btn-close\"__N__                            data-bs-dismiss=\"modal\"__N__                            aria-label=\"Close\"__N__                        ></button>__N__                    </div>__N____N__                    <div__N__                        class=\"modal-body d-flex flex-column justify-content-center\"__N__                    >__N__                        <div class=\"booking\">__N__                            <form__N__                                class=\"booking-form row\"__N__                                role=\"form\"__N__                                action=\"index.php\"__N__                                method=\"POST\"__N__                            >__N__                                <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />__N__                                <input type=\"hidden\" name=\"action\" value=\"sendmail\">__N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"name\" class=\"form-label\"__N__                                        >Full Name</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"name\"__N__                                        id=\"name\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Name\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"email\" class=\"form-label\"__N__                                        >Email Address</label__N__                                    >__N____N__                                    <input__N__                                        type=\"email\"__N__                                        name=\"email\"__N__                                        id=\"email\"__N__                                        pattern=\"[^ @]*@[^ @]*\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"your@email.com\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"phone\" class=\"form-label\"__N__                                        >Phone Number</label__N__                                    >__N____N__                                    <input__N__                                        type=\"telephone\"__N__                                        name=\"phone\"__N__                                        id=\"phone\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"people\" class=\"form-label\"__N__                                        >Number of persons</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"people\"__N__                                        id=\"people\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"12 persons\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"date\" class=\"form-label\"__N__                                        >Date</label__N__                                    >__N____N__                                    <input__N__                                        type=\"date\"__N__                                        name=\"date\"__N__                                        id=\"date\"__N__                                        value=\"\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"time\" class=\"form-label\"__N__                                        >Time</label__N__                                    >__N____N__                                    <select__N__                                        class=\"form-select form-control\"__N__                                        name=\"time\"__N__                                        id=\"time\"__N__                                    >__N__                                        <option value=\"5\" selected>__N__                                            5:00 PM__N__                                        </option>__N__                                        <option value=\"6\">6:00 PM</option>__N__                                        <option value=\"7\">7:00 PM</option>__N__                                        <option value=\"8\">8:00 PM</option>__N__                                        <option value=\"9\">9:00 PM</option>__N__                                    </select>__N__                                </div>__N____N__                                <div class=\"col-12\">__N__                                    <label for=\"message\" class=\"form-label\"__N__                                        >Special Request</label__N__                                    >__N____N__                                    <textarea__N__                                        class=\"form-control\"__N__                                        rows=\"4\"__N__                                        id=\"message\"__N__                                        name=\"message\"__N__                                        placeholder=\"\"__N__                                    ></textarea>__N__                                </div>__N____N__                                <div class=\"col-lg-4 col-12 ms-auto\">__N__                                    <button type=\"submit\" class=\"form-control\">__N__                                        Submit Request__N__                                    </button>__N__                                </div>__N__                            </form>__N__                        </div>__N__                    </div>__N____N__                    <div class=\"modal-footer\"></div>__N__                </div>__N__            </div>__N__        </div>__N____N__</section>__N__', '', 0);
--- File generated by Dolibarr 17.0.0-alpha -- 2022-10-08 18:18:50 UTC --;
--- Page ID 171 -> 3__+MAX_llx_website_page__ - Aliases index --;
-INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(3__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'index', '', 'index', '', '', '', '', '1', '2022-08-09 16:34:54', '2022-10-08 19:28:42', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N____N__<section id=\"mysection1\" contenteditable=\"true\">__N__<nav class=\"navbar navbar-expand-lg bg-white shadow-lg\">__N__            <div class=\"container\">__N__                <button__N__                    class=\"navbar-toggler\"__N__                    type=\"button\"__N__                    data-bs-toggle=\"collapse\"__N__                    data-bs-target=\"#navbarNav\"__N__                    aria-controls=\"navbarNav\"__N__                    aria-expanded=\"false\"__N__                    aria-label=\"Toggle navigation\"__N__                >__N__                    <span class=\"navbar-toggler-icon\"></span>__N__                </button>__N____N__                <a class=\"navbar-brand\" href=\"index.html\"><?php echo $mysoc->name; ?></a>__N____N__                <div class=\"d-lg-none\">__N__                    <a href=\"contact.php#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    >__N__                        Reservation__N__                    </a>__N__                </div>__N____N__                <div class=\"collapse navbar-collapse\" id=\"navbarNav\">__N__                    <ul class=\"navbar-nav mx-auto\">__N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link active\" href=\"index.php\"__N__                                >Home</a__N__                            >__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"about.php\">About</a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"menu.php\">Menu</a>__N__                        </li>__N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"contact.php\">Contact</a>__N__                        </li>__N__                    </ul>__N__                </div>__N____N__                <div class=\"d-none d-lg-block\">__N__                    <a href=\"contact.php#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    >__N__                        Reservation__N__                    </a>__N__                </div>__N__            </div>__N__        </nav>__N____N__        <main>__N__            <section class=\"hero\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-lg-5 col-12 m-auto\">__N__                            <div class=\"heroText\">__N__                                <h1 class=\"text-white mb-lg-5 mb-3\">__N__                                    Delicious Steaks__N__                                </h1>__N____N__                                <div__N__                                    class=\"c-reviews my-3 d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center\"__N__                                    >__N__                                        <h4 class=\"text-white mb-0 me-3\">__N__                                            4.7/5__N__                                        </h4>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N__                                    </div>__N____N__                                    <p class=\"text-white w-100\">__N__                                        From <strong>1,206+</strong> Customer__N__                                        Reviews__N__                                    </p>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-7 col-12\">__N__                            <div__N__                                id=\"carouselExampleCaptions\"__N__                                class=\"carousel carousel-fade hero-carousel slide\"__N__                                data-bs-ride=\"carousel\"__N__                            >__N__                                <div class=\"carousel-inner\">__N__                                    <div class=\"carousel-item active\">__N__                                        <div class=\"carousel-image-wrap\">__N__                                            <img__N__                                                src=\"image/__WEBSITE_KEY__/slide/jay-wennington-N_Y88TWmGwA-unsplash.jpg\"__N__                                                class=\"img-fluid carousel-image\"__N__                                                alt=\"\"__N__                                            />__N__                                        </div>__N____N__                                        <div class=\"carousel-caption\">__N__                                            <h4 class=\"hero-text\">__N__                                                Fine Dining Restaurant__N__                                            </h4>__N__                                        </div>__N__                                    </div>__N____N__                                    <div class=\"carousel-item\">__N__                                        <div class=\"carousel-image-wrap\">__N__                                            <img__N__                                                src=\"image/__WEBSITE_KEY__/slide/jason-leung-O67LZfeyYBk-unsplash.jpg\"__N__                                                class=\"img-fluid carousel-image\"__N__                                                alt=\"\"__N__                                            />__N__                                        </div>__N____N__                                        <div class=\"carousel-caption\">__N__                                            <div__N__                                                class=\"d-flex align-items-center\"__N__                                            >__N__                                                <h4 class=\"hero-text\">Steak</h4>__N____N__                                                <span class=\"price-tag ms-4\"__N__                                                    >26.50<small>€</small></span__N__                                                >__N__                                            </div>__N____N__                                            <div__N__                                                class=\"d-flex flex-wrap align-items-center\"__N__                                            >__N__                                                <h5__N__                                                    class=\"reviews-text mb-0 me-3\"__N__                                                >__N__                                                    3.8/5__N__                                                </h5>__N____N__                                                <div class=\"reviews-stars\">__N__                                                    <i__N__                                                        class=\"bi-star-fill reviews-icon\"__N__                                                    ></i>__N__                                                    <i__N__                                                        class=\"bi-star-fill reviews-icon\"__N__                                                    ></i>__N__                                                    <i__N__                                                        class=\"bi-star-fill reviews-icon\"__N__                                                    ></i>__N__                                                    <i__N__                                                        class=\"bi-star reviews-icon\"__N__                                                    ></i>__N__                                                    <i__N__                                                        class=\"bi-star reviews-icon\"__N__                                                    ></i>__N__                                                </div>__N__                                            </div>__N__                                        </div>__N__                                    </div>__N____N__                                    <div class=\"carousel-item\">__N__                                        <div class=\"carousel-image-wrap\">__N__                                            <img__N__                                                src=\"image/__WEBSITE_KEY__/slide/ivan-torres-MQUqbmszGGM-unsplash.jpg\"__N__                                                class=\"img-fluid carousel-image\"__N__                                                alt=\"\"__N__                                            />__N__                                        </div>__N____N__                                        <div class=\"carousel-caption\">__N__                                            <div__N__                                                class=\"d-flex align-items-center\"__N__                                            >__N__                                                <h4 class=\"hero-text\">__N__                                                    Sausage Pasta__N__                                                </h4>__N____N__                                                <span class=\"price-tag ms-4\"__N__                                                    >18.25<small>€</small></span__N__                                                >__N__                                            </div>__N____N__                                            <div__N__                                                class=\"d-flex flex-wrap align-items-center\"__N__                                            >__N__                                                <h5__N__                                                    class=\"reviews-text mb-0 me-3\"__N__                                                >__N__                                                    4.2/5__N__                                                </h5>__N____N__                                                <div class=\"reviews-stars\">__N__                                                    <i__N__                                                        class=\"bi-star-fill reviews-icon\"__N__                                                    ></i>__N__                                                    <i__N__                                                        class=\"bi-star-fill reviews-icon\"__N__                                                    ></i>__N__                                                    <i__N__                                                        class=\"bi-star-fill reviews-icon\"__N__                                                    ></i>__N__                                                    <i__N__                                                        class=\"bi-star-fill reviews-icon\"__N__                                                    ></i>__N__                                                    <i__N__                                                        class=\"bi-star reviews-icon\"__N__                                                    ></i>__N__                                                </div>__N__                                            </div>__N__                                        </div>__N__                                    </div>__N__                                </div>__N____N__                                <button__N__                                    class=\"carousel-control-prev\"__N__                                    type=\"button\"__N__                                    data-bs-target=\"#carouselExampleCaptions\"__N__                                    data-bs-slide=\"prev\"__N__                                >__N__                                    <span__N__                                        class=\"carousel-control-prev-icon\"__N__                                        aria-hidden=\"true\"__N__                                    ></span>__N__                                    <span class=\"visually-hidden\"__N__                                        >Previous</span__N__                                    >__N__                                </button>__N____N__                                <button__N__                                    class=\"carousel-control-next\"__N__                                    type=\"button\"__N__                                    data-bs-target=\"#carouselExampleCaptions\"__N__                                    data-bs-slide=\"next\"__N__                                >__N__                                    <span__N__                                        class=\"carousel-control-next-icon\"__N__                                        aria-hidden=\"true\"__N__                                    ></span>__N__                                    <span class=\"visually-hidden\">Next</span>__N__                                </button>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N____N__                <div class=\"video-wrap\">__N__                    <video__N__                        autoplay=\"\"__N__                        loop=\"\"__N__                        muted=\"\"__N__                        class=\"custom-video\"__N__                        poster=\"\"__N__                    >__N__                        <source__N__                            src=\"image/__WEBSITE_KEY__/video/production_ID_3769033.mp4\"__N__                            type=\"video/mp4\"__N__                        />__N__                        Your browser does not support the video tag.__N__                    </video>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </section>__N____N__            <section class=\"menu section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"text-center mb-lg-5 mb-4\">__N__                                Special Menus__N__                            </h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Breakfast</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Morning Fresh</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >12.50<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            4.3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            102 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/lunch/farhad-ibrahimzade-MGKqxm6u2bc-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Lunch</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">DoliCloud Soup</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >24.50<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            50 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Dinner</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Premium Steak</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >45<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            86 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Dinner</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Seafood Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >86<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            44 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Breakfast</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Burger Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >20.50<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            4.3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            102 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/lunch/farhad-ibrahimzade-D5c9ZciQy_I-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Lunch</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Healthy Soup</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >34.20<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            64 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N__        </main>__N____N__        <footer class=\"site-footer section-padding\">__N__            <div class=\"container\">__N__                <div class=\"row\">__N__                    <div class=\"col-12\">__N__                        <h4 class=\"text-white mb-4 me-5\"><?php echo $mysoc->name; ?></h4>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-7 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Location</h6>__N____N__                        <p><?php echo $mysoc->getFullAddress(); ?></p>__N____N__                        <a__N__                            href=\"https://goo.gl/maps/CJ8FfebWZHLQBA2r5\"__N__                            class=\"custom-btn btn btn-dark mt-2\"__N__                            >Directions</a__N__                        >__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-5 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Opening Hours</h6>__N____N__         __N__                        <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                        foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N____N__                        <p>__N__                            Tel:__N__                            <a href=\"tel: 010-02-0340\" class=\"tel-link\"__N__                                ><?php echo $mysoc->phone ?></a__N__                            >__N__                        </p>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-6 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Social</h6>__N____N__                        <ul class=\"social-icon\">__N__                             <?php foreach($mysoc->socialnetworks as $key => $value) {__N__                                print \'<li> <a class=\"btn btn-perso2 btn-floating m-1\" href=\"\'. (preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\"></i></a> </li>\';__N__                             } ?>__N____N__                       __N__                        </ul>__N____N__                        <p class=\"copyright-text tooplate-mt60\">__N__                            Copyright © <?php echo $mysoc->name; ?>__N__                        </p>__N__                    </div>__N__                </div>__N__                <!-- row ending -->__N__            </div>__N__            <!-- container ending -->__N__        </footer>__N____N__</section>__N__', '', 0);
-UPDATE llx_website SET fk_default_home = 3__+MAX_llx_website_page__ WHERE rowid = __WEBSITE_ID__;
--- File generated by Dolibarr 17.0.0-alpha -- 2022-10-08 18:18:50 UTC --;
--- Page ID 172 -> 4__+MAX_llx_website_page__ - Aliases menu --;
-INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(4__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'menu', '', 'Our menus', '', '', '', '', '1', '2022-08-16 14:37:03', '2022-10-08 19:23:06', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<section id=\"mysection1\" contenteditable=\"true\">__N__       <nav class=\"navbar navbar-expand-lg bg-white shadow-lg\">__N__            <div class=\"container\">__N__                <button__N__                    class=\"navbar-toggler\"__N__                    type=\"button\"__N__                    data-bs-toggle=\"collapse\"__N__                    data-bs-target=\"#navbarNav\"__N__                    aria-controls=\"navbarNav\"__N__                    aria-expanded=\"false\"__N__                    aria-label=\"Toggle navigation\"__N__                >__N__                    <span class=\"navbar-toggler-icon\"></span>__N__                </button>__N____N__                <a class=\"navbar-brand\" href=\"index.html\"><?php echo $mysoc->name; ?></a>__N____N__                <div class=\"d-lg-none\">__N__                    <a href=\"contact.php#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    >__N__                        Reservation__N__                    </a>__N__                </div>__N____N__                <div class=\"collapse navbar-collapse\" id=\"navbarNav\">__N__                    <ul class=\"navbar-nav mx-auto\">__N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"index.php\">Home</a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"about.php\">About</a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link active\" href=\"menu.php\">Menu</a>__N__                        </li>__N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link\" href=\"contact.php\">Contact</a>__N__                        </li>__N__                    </ul>__N__                </div>__N____N__                <div class=\"d-none d-lg-block\">__N__                    <a href=\"contact.php#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    >__N__                        Reservation__N__                    </a>__N__                </div>__N__            </div>__N__        </nav>__N____N__        <main>__N__            <header class=\"site-header site-menu-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">Our Menus</h1>__N____N__                            <strong class=\"text-white\"__N__                                >Perfect for all Breakfast, Lunch and__N__                                Dinner</strong__N__                            >__N__                        </div>__N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>__N____N__            <section class=\"menu section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-lg-5 mb-4\">Breakfast Menu</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Fresh Start</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>24.50</span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            4.4/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            128 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"/image/__WEBSITE_KEY__/breakfast/lucas-swennen-1W_MyJSRLuQ-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Baked Creamy</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>16.50</span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            64 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Burger Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>24.50</span__N__                                    >__N____N__                                    <del class=\"ms-4\"__N__                                        ><small>$</small>36.50</del__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            32 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N____N__            <section class=\"menu section-padding bg-white\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-lg-5 mb-4\">Lunch Menu</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/lunch/louis-hansel-cH5IPjaAYyo-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Super Steak Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>32.75</span__N__                                    >__N____N__                                    <del class=\"ms-4\"><small>$</small>55</del>__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            4.2/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            66 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/lunch/louis-hansel-rheOvfxOlOA-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Bread &amp; Steak Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>42.50</span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            84 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N____N__            <section class=\"menu section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-lg-5 mb-4\">Dinner Menu</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Seafood Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>65.50</span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            4.4/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            102 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Premium Steak</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>74.25</span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            56 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/dinner/farhad-ibrahimzade-isHUj3N0194-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Salmon Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>60</span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <h6 class=\"reviews-text mb-0 me-3\">__N__                                            3/5__N__                                        </h6>__N____N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N____N__                                        <p class=\"reviews-text mb-0 ms-4\">__N__                                            76 Reviews__N__                                        </p>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N__        </main>__N____N__         <footer class=\"site-footer section-padding\">__N__            <div class=\"container\">__N__                <div class=\"row\">__N__                    <div class=\"col-12\">__N__                        <h4 class=\"text-white mb-4 me-5\"><?php echo $mysoc->name; ?></h4>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-7 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Location</h6>__N____N__                        <p><?php echo $mysoc->getFullAddress(); ?></p>__N____N__                        <a__N__                            href=\"https://goo.gl/maps/CJ8FfebWZHLQBA2r5\"__N__                            class=\"custom-btn btn btn-dark mt-2\"__N__                            >Directions</a__N__                        >__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-5 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Opening Hours</h6>__N____N__         __N__                        <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                        foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N____N__                        <p>__N__                            Tel:__N__                            <a href=\"tel: 010-02-0340\" class=\"tel-link\"__N__                                ><?php echo $mysoc->phone ?></a__N__                            >__N__                        </p>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-6 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Social</h6>__N____N__                        <ul class=\"social-icon\">__N__                             <?php foreach($mysoc->socialnetworks as $key => $value) {__N__                                print \'<li> <a class=\"btn btn-perso2 btn-floating m-1\" href=\"\'. (preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\"></i></a> </li>\';__N__                             } ?>__N____N__                       __N__                        </ul>__N____N__                        <p class=\"copyright-text tooplate-mt60\">__N__                            Copyright © <?php echo $mysoc->name; ?>__N__                        </p>__N__                    </div>__N__                </div>__N__                <!-- row ending -->__N__            </div>__N__            <!-- container ending -->__N__        </footer>__N____N__</section>__N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 248 -> 1__+MAX_llx_website_page__ - Aliases about --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(1__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'about', '', 'About us', '', '', '', '', '1', '2022-08-09 16:40:13', '2022-11-20 14:15:19', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<?php includeContainer(\'header\'); ?>__N____N__<section id=\"mysection1\" contenteditable=\"true\">__N__        <main>__N____N__            <header class=\"site-header site-about-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N____N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">About Us</h1>__N____N__                            <strong class=\"text-white\">Get to know us more</strong>__N__                        </div>__N____N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>           __N____N__            <section class=\"about section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N____N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-5\">Team Members</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/matthew-hamilton-tNCH0sKSZbA-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N__                                __N__                                <div class=\"team-info\">__N__                                    <h4 class=\"mt-3 mb-0\">Sophia</h4>__N____N__                                    <p>CEO &amp; Founder</p>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12 my-lg-0 my-4\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/nicolas-horn-MTZTGvDsHFY-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N____N__                                <h4 class=\"mt-3 mb-0\">Benjamin W.</h4>__N____N__                                <p>Restaurant Manager</p>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12\">__N__                            <div class=\"team-thumb\">__N__                                <img src=\"image/__WEBSITE_KEY__/team/rc-cf-FMh5o5m5N9E-unsplash.jpg\" class=\"img-fluid team-image\" alt=\"\">__N__                                __N__                                <h4 class=\"mt-3 mb-0\">Muchen Jack</h4>__N____N__                                <p>Senior Chef</p>__N__                            </div>__N__                        </div>__N____N__                    </div>__N__                </div>__N__            </section>__N__            __N__        </main>__N____N__</section>__N____N____N__<?php includeContainer(\'footer\'); ?>__N____N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 249 -> 2__+MAX_llx_website_page__ - Aliases contact --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(2__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'contact', '', 'Contact us', '', '', '', '', '1', '2022-08-16 14:40:51', '2022-11-20 14:50:10', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<?php __N__if (GETPOST(\'action\') == \'sendmail\')    {__N__    include_once DOL_DOCUMENT_ROOT.\'/core/class/CMailFile.class.php\';__N__    $from = GETPOST(\'email\', \'alpha\');__N__    $to = $mysoc->email;__N__    $message = GETPOST(\'message\', \'alpha\');__N__    $cmail = new CMailFile(\'Contact from website\', $to, $from, $message);__N__    if ($cmail->sendfile()) {__N__        ?>__N__        <script>__N__            alert(\"Message sent successfully !\");__N__        </script>__N__        <?php__N__	} else {__N__		echo $langs->trans(\"ErrorFailedToSendMail\", $from, $to).\'. \'.$cmail->error;__N__	}__N__}__N__?>__N____N__<?php includeContainer(\'header\'); ?>__N____N____N__<section id=\"mysection1\" contenteditable=\"true\">__N__    <main>__N__            <header class=\"site-header site-contact-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">Say Hi</h1>__N____N__                            <strong class=\"text-white\"__N__                                >We are happy to get in touch with you</strong__N__                            >__N__                        </div>__N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>__N____N__            <a id=\"reservation\"></a><br>__N__            __N__            <section class=\"contact section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-4\">Leave a message</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <form__N__                                class=\"custom-form contact-form row\"__N__                                action=\"#\"__N__                                method=\"post\"__N__                                role=\"form\"__N__                            >__N__                                <input type=\"hidden\" name=\"action\" value=\"sendmail\">__N__                                <input type=\"hidden\" name=\"toekn\" value=\"<?php echo newToken(); ?>\">__N__                                __N__                                <div class=\"col-lg-6 col-6\">__N__                                    <label for=\"contact-name\" class=\"form-label\"__N__                                        >Full Name</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"contact-name\"__N__                                        id=\"contact-name\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Name\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-6\">__N__                                    <label__N__                                        for=\"contact-phone\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Phone\"); ?></label__N__                                    >__N____N__                                    <input__N__                                        type=\"telephone\"__N__                                        name=\"contact-phone\"__N__                                        id=\"contact-phone\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-12\">__N__                                    <label__N__                                        for=\"contact-email\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Email\"); ?></label__N__                                    >__N____N__                                    <input__N__                                        type=\"email\"__N__                                        name=\"contact-email\"__N__                                        id=\"contact-email\"__N__                                        pattern=\"[^ @]*@[^ @]*\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Email\"__N__                                        required=\"\"__N__                                    />__N____N__                                    <label__N__                                        for=\"contact-message\"__N__                                        class=\"form-label\"__N__                                        ><?php echo $weblangs->trans(\"Message\"); ?></label__N__                                    >__N____N__                                    <textarea__N__                                        class=\"form-control\"__N__                                        rows=\"5\"__N__                                        id=\"contact-message\"__N__                                        name=\"contact-message\"__N__                                        placeholder=\"Your Message\"__N__                                    ></textarea>__N__                                </div>__N____N__                                <div class=\"col-lg-5 col-12 ms-auto\">__N__                                    <button type=\"submit\" class=\"form-control\">__N__                                        <?php echo $weblangs->trans(\"Send\"); ?>__N__                                    </button>__N__                                </div>__N__                            </form>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-12 mx-auto mt-lg-5 mt-4\">__N__                            <h5>Weekdays</h5>__N____N__                            <div class=\" mb-lg-3\">__N__                                 <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                                   foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N__                            </div>__N____N__                            <h5>Weekends</h5>__N____N__                            <div class=\"d-flex\">__N__                                <p>Saturday and Sunday</p>__N____N__                                <p class=\"ms-5\">to be determined !</p>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-12\" id=\"divaddress\">__N__                            <br><br>__N__                        __N__                            <h4 class=\"mt-5 mb-4 center\">__N__                                <?php echo $mysoc->getFullAddress() ?>__N__                            </h4>__N____N__                            <!-- Google MAPS -->__N__                            <center><div class=\"mapouter\"><div class=\"gmap_canvas\"><iframe width=\"600\" height=\"500\" id=\"gmap_canvas\" src=\"https://maps.google.com/maps?q=<?php echo urlencode($mysoc->getFullAddress()); ?>&t=&z=13&ie=UTF8&iwloc=&output=embed\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\"></iframe>__N__                            </div>__N__                            <style>.mapouter{text-align:right;height:500px;width:600px;}.gmap_canvas {overflow:hidden;background:none!important;height:500px;width:600px;}</style>__N__                            </div></center>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N__        </main>__N____N____N__        __N__        <!-- Modal -->__N__        <div__N__            class=\"modal fade\"__N__            id=\"BookingModal\"__N__            tabindex=\"-1\"__N__            aria-labelledby=\"BookingModal\"__N__            aria-hidden=\"true\"__N__        >__N__            <div class=\"modal-dialog modal-dialog-centered modal-xl\">__N__                <div class=\"modal-content\">__N__                    <div class=\"modal-header\">__N__                        <h3 class=\"mb-0\">Reserve a table</h3>__N____N__                        <button__N__                            type=\"button\"__N__                            class=\"btn-close\"__N__                            data-bs-dismiss=\"modal\"__N__                            aria-label=\"Close\"__N__                        ></button>__N__                    </div>__N____N__                    <div__N__                        class=\"modal-body d-flex flex-column justify-content-center\"__N__                    >__N__                        <div class=\"booking\">__N__                            <form__N__                                class=\"booking-form row\"__N__                                role=\"form\"__N__                                action=\"contact.php\"__N__                                method=\"POST\"__N__                            >__N__                                <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />__N__                                <input type=\"hidden\" name=\"action\" value=\"sendmail\">__N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"name\" class=\"form-label\"__N__                                        >Full Name</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"name\"__N__                                        id=\"name\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"Your Name\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"email\" class=\"form-label\"__N__                                        >Email Address</label__N__                                    >__N____N__                                    <input__N__                                        type=\"email\"__N__                                        name=\"email\"__N__                                        id=\"email\"__N__                                        pattern=\"[^ @]*@[^ @]*\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"your@email.com\"__N__                                        required__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"phone\" class=\"form-label\"__N__                                        >Phone Number</label__N__                                    >__N____N__                                    <input__N__                                        type=\"telephone\"__N__                                        name=\"phone\"__N__                                        id=\"phone\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"people\" class=\"form-label\"__N__                                        >Number of persons</label__N__                                    >__N____N__                                    <input__N__                                        type=\"text\"__N__                                        name=\"people\"__N__                                        id=\"people\"__N__                                        class=\"form-control\"__N__                                        placeholder=\"12 persons\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"date\" class=\"form-label\"__N__                                        >Date</label__N__                                    >__N____N__                                    <input__N__                                        type=\"date\"__N__                                        name=\"date\"__N__                                        id=\"date\"__N__                                        value=\"\"__N__                                        class=\"form-control\"__N__                                    />__N__                                </div>__N____N__                                <div class=\"col-lg-6 col-12\">__N__                                    <label for=\"time\" class=\"form-label\"__N__                                        >Time</label__N__                                    >__N____N__                                    <select__N__                                        class=\"form-select form-control\"__N__                                        name=\"time\"__N__                                        id=\"time\"__N__                                    >__N__                                        <option value=\"5\" selected>__N__                                            5:00 PM__N__                                        </option>__N__                                        <option value=\"6\">6:00 PM</option>__N__                                        <option value=\"7\">7:00 PM</option>__N__                                        <option value=\"8\">8:00 PM</option>__N__                                        <option value=\"9\">9:00 PM</option>__N__                                    </select>__N__                                </div>__N____N__                                <div class=\"col-12\">__N__                                    <label for=\"message\" class=\"form-label\"__N__                                        >Special Request</label__N__                                    >__N____N__                                    <textarea__N__                                        class=\"form-control\"__N__                                        rows=\"4\"__N__                                        id=\"message\"__N__                                        name=\"message\"__N__                                        placeholder=\"\"__N__                                    ></textarea>__N__                                </div>__N____N__                                <div class=\"col-lg-4 col-12 ms-auto\">__N__                                    <button type=\"submit\" class=\"form-control\">__N__                                        Submit Request__N__                                    </button>__N__                                </div>__N__                            </form>__N__                        </div>__N__                    </div>__N____N__                    <div class=\"modal-footer\"></div>__N__                </div>__N__            </div>__N__        </div>__N____N__</section>__N____N____N__<?php includeContainer(\'footer\'); ?>__N____N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 252 -> 3__+MAX_llx_website_page__ - Aliases footer --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(3__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'footer', '', 'Footer', '', '', '', '', '1', '2022-11-20 12:51:50', '2022-11-20 14:07:39', null, '', 'other', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N__<section id=\"footer\" contenteditable=\"true\">__N__            <!-- Footer -->__N__        <footer class=\"site-footer section-padding\">__N__            <div class=\"container\">__N__                <div class=\"row\">__N__                    <div class=\"col-lg-4 col-md-7 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\"><?php echo $weblangs->trans(\"Location\"); ?></h6>__N____N__                        <p><?php echo $mysoc->getFullAddress(); ?></p>__N____N__                        <a href=\"contact.php#divaddress\" class=\"custom-btn btn btn-dark mt-2\"><?php echo $weblangs->trans(\"Map\"); ?></a>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-5 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Opening Hours</h6>__N____N__         __N__                        <?php $days = [\"MONDAY\", \"TUESDAY\", \"WEDNESDAY\", \"THURSDAY\", \"FRIDAY\"];__N__                        foreach ($days as $day){__N__                            echo \"<p> $day : \" .getDolGlobalString(\"MAIN_INFO_OPENINGHOURS_$day\")  .\"</p>\";    __N__                        }__N__                        ?>__N____N__                        <p>__N__                            Tel:__N__                            <a href=\"tel: <?php echo $mysoc->phone ?>\" class=\"tel-link\"__N__                                ><?php echo $mysoc->phone ?></a__N__                            >__N__                        </p>__N__                    </div>__N____N__                    <div class=\"col-lg-4 col-md-6 col-xs-12 tooplate-mt30\">__N__                        <h6 class=\"text-white mb-lg-4 mb-3\">Social</h6>__N____N__                        <ul class=\"social-icon\">__N__                             <?php foreach($mysoc->socialnetworks as $key => $value) {__N__                                print \'<li> <a class=\"btn btn-perso2 btn-floating m-1\" href=\"\'. (preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\"></i></a> </li>\';__N__                             } ?>__N____N__                       __N__                        </ul>__N____N__                        <p class=\"copyright-text tooplate-mt60\">__N__                            Copyright © <?php echo $mysoc->name; ?>__N__                        </p>__N__                    </div>__N__                </div>__N__                <!-- row ending -->__N__            </div>__N__            <!-- container ending -->__N__        </footer>__N__</section>__N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 253 -> 4__+MAX_llx_website_page__ - Aliases header --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(4__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'header', '', 'Header', '', '', '', '', '1', '2022-11-20 13:12:33', '2022-11-20 14:21:25', null, '', 'menu', '', '<section id=\"header\" contenteditable=\"true\">__N__    <nav class=\"navbar navbar-expand-lg bg-white shadow-lg\">__N__            <div class=\"container\">__N__                <button__N__                    class=\"navbar-toggler\"__N__                    type=\"button\"__N__                    data-bs-toggle=\"collapse\"__N__                    data-bs-target=\"#navbarNav\"__N__                    aria-controls=\"navbarNav\"__N__                    aria-expanded=\"false\"__N__                    aria-label=\"Toggle navigation\"__N__                >__N__                    <span class=\"navbar-toggler-icon\"></span>__N__                </button>__N____N__                <a class=\"navbar-brand\" href=\"index.html\"><?php echo $mysoc->name; ?></a>__N____N__                <div class=\"d-lg-none\">__N__                    <a href=\"contact.php#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    ><?php $langs->trans(\"Reservation\"); ?></a>__N__                </div>__N____N__                <div class=\"collapse navbar-collapse\" id=\"navbarNav\">__N__                    <ul class=\"navbar-nav mx-auto\">__N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link<?php echo ($websitepage->ref == \'index\' ? \' active\' : \'\'); ?>\" href=\"index.php\"><?php echo $weblangs->trans(\"Home\"); ?></a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link<?php echo ($websitepage->ref == \'about\' ? \' active\' : \'\'); ?>\" href=\"about.php\"><?php echo $weblangs->trans(\"About\"); ?></a>__N__                        </li>__N____N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link<?php echo ($websitepage->ref == \'menu\' ? \' active\' : \'\'); ?>\" href=\"menu.php\"><?php echo $weblangs->trans(\"Menu\"); ?></a>__N__                        </li>__N__                        __N__                        <li class=\"nav-item\">__N__                            <a class=\"nav-link<?php echo ($websitepage->ref == \'contact\' ? \' active\' : \'\'); ?>\" href=\"contact.php\"><?php echo $weblangs->trans(\"Contact\"); ?></a>__N__                        </li>__N__                    </ul>__N__                </div>__N____N__                <div class=\"d-none d-lg-block\">__N__                    <a href=\"contact.php#reservation\"__N__                        type=\"button\"__N__                        class=\"custom-btn btn btn-danger\"__N__                        data-bs-toggle=\"modal\"__N__                        data-bs-target=\"#BookingModal\"__N__                    ><?php echo $weblangs->trans(\"Reservation\"); ?></a>__N__                </div>__N__            </div>__N__    </nav>__N__</section>__N____N__', '', 0);
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 250 -> 5__+MAX_llx_website_page__ - Aliases index --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(5__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'index', '', 'index', '', '', '', '', '1', '2022-08-09 16:34:54', '2022-11-20 15:10:45', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N____N__<?php includeContainer(\'header\'); ?>__N____N____N__<section id=\"mysection1\" contenteditable=\"true\">__N__        <main>__N__            <section class=\"hero\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-lg-5 col-12 m-auto\">__N__                            <div class=\"heroText\">__N__                                <h1 class=\"text-white mb-lg-5 mb-3\">__N__                                    Delicious Steaks__N__                                </h1>__N____N__                                <div class=\"c-reviews my-3 d-flex flex-wrap align-items-center\">__N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center\">__N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-7 col-12\">__N__                            <div__N__                                id=\"carouselExampleCaptions\"__N__                                class=\"carousel carousel-fade hero-carousel slide\"__N__                                data-bs-ride=\"carousel\"__N__                            >__N__                                <div class=\"carousel-inner\">__N__                                    <div class=\"carousel-item active\">__N__                                        <div class=\"carousel-image-wrap\">__N__                                            <img__N__                                                src=\"image/__WEBSITE_KEY__/slide/jay-wennington-N_Y88TWmGwA-unsplash.jpg\"__N__                                                class=\"img-fluid carousel-image\"__N__                                                alt=\"\"__N__                                            />__N__                                        </div>__N____N__                                        <div class=\"carousel-caption\">__N__                                            <h4 class=\"hero-text\">__N__                                                Fine Dining Restaurant__N__                                            </h4>__N__                                        </div>__N__                                    </div>__N____N__                                    <div class=\"carousel-item\">__N__                                        <div class=\"carousel-image-wrap\">__N__                                            <img__N__                                                src=\"image/__WEBSITE_KEY__/slide/jason-leung-O67LZfeyYBk-unsplash.jpg\"__N__                                                class=\"img-fluid carousel-image\"__N__                                                alt=\"\"__N__                                            />__N__                                        </div>__N____N__                                        <div class=\"carousel-caption\">__N__                                            <div__N__                                                class=\"d-flex align-items-center\"__N__                                            >__N__                                                <h4 class=\"hero-text\">Steak</h4>__N____N__                                                <span class=\"price-tag ms-4\"__N__                                                    >26.50<small>€</small></span__N__                                                >__N__                                            </div>__N__                                        </div>__N__                                    </div>__N____N__                                    <div class=\"carousel-item\">__N__                                        <div class=\"carousel-image-wrap\">__N__                                            <img__N__                                                src=\"image/__WEBSITE_KEY__/slide/ivan-torres-MQUqbmszGGM-unsplash.jpg\"__N__                                                class=\"img-fluid carousel-image\"__N__                                                alt=\"\"__N__                                            />__N__                                        </div>__N____N__                                        <div class=\"carousel-caption\">__N__                                            <div__N__                                                class=\"d-flex align-items-center\"__N__                                            >__N__                                                <h4 class=\"hero-text\">__N__                                                    Sausage Pasta__N__                                                </h4>__N____N__                                                <span class=\"price-tag ms-4\"__N__                                                    >18.25<small>€</small></span__N__                                                >__N__                                            </div>__N__                                        </div>__N__                                    </div>__N__                                </div>__N____N__                                <button__N__                                    class=\"carousel-control-prev\"__N__                                    type=\"button\"__N__                                    data-bs-target=\"#carouselExampleCaptions\"__N__                                    data-bs-slide=\"prev\"__N__                                >__N__                                    <span__N__                                        class=\"carousel-control-prev-icon\"__N__                                        aria-hidden=\"true\"__N__                                    ></span>__N__                                    <span class=\"visually-hidden\"__N__                                        >Previous</span__N__                                    >__N__                                </button>__N____N__                                <button__N__                                    class=\"carousel-control-next\"__N__                                    type=\"button\"__N__                                    data-bs-target=\"#carouselExampleCaptions\"__N__                                    data-bs-slide=\"next\"__N__                                >__N__                                    <span__N__                                        class=\"carousel-control-next-icon\"__N__                                        aria-hidden=\"true\"__N__                                    ></span>__N__                                    <span class=\"visually-hidden\">Next</span>__N__                                </button>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </section>__N____N__            <section class=\"menu section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"text-center mb-lg-5 mb-4\">__N__                                Special Menus__N__                            </h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Breakfast</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Morning Fresh</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >12.50<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/lunch/farhad-ibrahimzade-MGKqxm6u2bc-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Lunch</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">DoliCloud Soup</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >24.50<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Dinner</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Premium Steak</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >45<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Dinner</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Seafood Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >86<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Breakfast</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Burger Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >20.50<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <div class=\"menu-image-wrap\">__N__                                    <img__N__                                        src=\"image/__WEBSITE_KEY__/lunch/farhad-ibrahimzade-D5c9ZciQy_I-unsplash.jpg\"__N__                                        class=\"img-fluid menu-image\"__N__                                        alt=\"\"__N__                                    />__N____N__                                    <span class=\"menu-tag bg-warning\"__N__                                        >Lunch</span__N__                                    >__N__                                </div>__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Healthy Soup</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        >34.20<small>€</small></span__N__                                    >__N____N__                                    <div__N__                                        class=\"d-flex flex-wrap align-items-center w-100 mt-2\"__N__                                    >__N__                                        <div class=\"reviews-stars\">__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i__N__                                                class=\"bi-star-fill reviews-icon\"__N__                                            ></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                            <i class=\"bi-star reviews-icon\"></i>__N__                                        </div>__N__                                    </div>__N__                                </div>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N__        </main>__N____N__</section>__N____N____N__<?php includeContainer(\'footer\'); ?>__N__', '', 0);
+UPDATE llx_website SET fk_default_home = 5__+MAX_llx_website_page__ WHERE rowid = __WEBSITE_ID__;
+-- File generated by Dolibarr 17.0.0-beta -- 2022-11-20 14:10:56 UTC --;
+-- Page ID 251 -> 6__+MAX_llx_website_page__ - Aliases menu --;
+INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames) VALUES(6__+MAX_llx_website_page__, null, __WEBSITE_ID__, 'menu', '', 'Our menus', '', '', '', '', '1', '2022-08-16 14:37:03', '2022-11-20 14:30:03', null, '', 'page', '', '<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->__N____N__<?php includeContainer(\'header\'); ?>__N____N____N__<section id=\"mysection1\" contenteditable=\"true\">__N__        <main>__N__            <header class=\"site-header site-menu-header\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-lg-10 col-12 mx-auto\">__N__                            <h1 class=\"text-white\">Our Menus</h1>__N____N__                            <strong class=\"text-white\"__N__                                >Perfect for all Breakfast, Lunch and__N__                                Dinner</strong__N__                            >__N__                        </div>__N__                    </div>__N__                </div>__N____N__                <div class=\"overlay\"></div>__N__            </header>__N____N__            <section class=\"menu section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-lg-5 mb-4\">Breakfast Menu</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/breakfast/brett-jordan-8xt8-HIFqc8-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Fresh Start</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>24.50</span__N__                                    >__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"/image/__WEBSITE_KEY__/breakfast/lucas-swennen-1W_MyJSRLuQ-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Baked Creamy</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>16.50</span__N__                                    >__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/breakfast/louis-hansel-dphM2U1xq0U-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Burger Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>24.50</span__N__                                    >__N____N__                                    <del class=\"ms-4\"__N__                                        ><small>$</small>36.50</del__N__                                    >__N__                                </div>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N____N__            <section class=\"menu section-padding bg-white\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-lg-5 mb-4\">Lunch Menu</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/lunch/louis-hansel-cH5IPjaAYyo-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Super Steak Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>32.75</span__N__                                    >__N____N__                                    <del class=\"ms-4\"><small>$</small>55</del>__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/lunch/louis-hansel-rheOvfxOlOA-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Bread &amp; Steak Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>42.50</span__N__                                    >__N__                                </div>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N____N__            <section class=\"menu section-padding\">__N__                <div class=\"container\">__N__                    <div class=\"row\">__N__                        <div class=\"col-12\">__N__                            <h2 class=\"mb-lg-5 mb-4\">Dinner Menu</h2>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/dinner/farhad-ibrahimzade-ZipYER3NLhY-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Seafood Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>65.50</span__N__                                    >__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/dinner/keriliwi-c3mFafsFz2w-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Premium Steak</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>74.25</span__N__                                    >__N__                                </div>__N__                            </div>__N__                        </div>__N____N__                        <div class=\"col-lg-4 col-md-6 col-12\">__N__                            <div class=\"menu-thumb\">__N__                                <img__N__                                    src=\"image/__WEBSITE_KEY__/dinner/farhad-ibrahimzade-isHUj3N0194-unsplash.jpg\"__N__                                    class=\"img-fluid menu-image\"__N__                                    alt=\"\"__N__                                />__N____N__                                <div__N__                                    class=\"menu-info d-flex flex-wrap align-items-center\"__N__                                >__N__                                    <h4 class=\"mb-0\">Salmon Set</h4>__N____N__                                    <span__N__                                        class=\"price-tag bg-white shadow-lg ms-4\"__N__                                        ><small>$</small>60</span__N__                                    >__N__                                </div>__N__                            </div>__N__                        </div>__N__                    </div>__N__                </div>__N__            </section>__N__        </main>__N____N__</section>__N____N____N__<?php includeContainer(\'footer\'); ?>__N__', '', 0);
 
 -- For Dolibarr v14+ --;
 UPDATE llx_website SET lang = 'en' WHERE rowid = __WEBSITE_ID__;
diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
index bef3e07e910..0b4b773be40 100644
--- a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -55,6 +55,8 @@ ALTER TABLE llx_user DROP COLUMN idpers3;
 
 -- v17
 
+ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_percent (percent);
+
 UPDATE llx_c_paiement SET code = 'BANCON' WHERE code = 'BAN' AND libelle = 'Bancontact';
 
 -- VMYSQL4.3 ALTER TABLE llx_partnership MODIFY COLUMN fk_user_creat integer NULL;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.key.sql b/htdocs/install/mysql/tables/llx_actioncomm.key.sql
index ee16386c7c4..944471620ae 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.key.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.key.sql
@@ -27,5 +27,6 @@ ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_datep (datep);
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_datep2 (datep2);
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_recurid (recurid);
 ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_ref_ext (ref_ext);
+ALTER TABLE llx_actioncomm ADD INDEX idx_actioncomm_percent (percent);
 
 ALTER TABLE llx_actioncomm ADD UNIQUE INDEX uk_actioncomm_ref (ref, entity);
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 0c2fdce5152..2267113e987 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -57,7 +57,7 @@ create table llx_product
   fk_user_modif                 integer,                            -- user making last change
   tosell                        tinyint      DEFAULT 1,             -- Product you sell
   tobuy                         tinyint      DEFAULT 1,             -- Product you buy
-  onportal                      tinyint      DEFAULT 0,	            -- If it is a product you sell and you want to sell it on portal (module website must be on)
+  onportal                      tinyint      DEFAULT 0,	            -- If it is a product you sell and you want to sell it from internal portal (module 'portal')
   tobatch                       tinyint      DEFAULT 0 NOT NULL,    -- Is it a product that need a batch management (eat-by or lot management)
   sell_or_eat_by_mandatory      tinyint      DEFAULT 0 NOT NULL,    -- Make sell-by or eat-by date mandatory
   batch_mask			        varchar(32)  DEFAULT NULL,          -- If the product has batch feature, you may want to use a batch mask per product
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index 7f198db6042..47671f4e7c3 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -44,7 +44,7 @@ create table llx_societe
   town                     varchar(50),                         		-- town
   fk_departement           integer        DEFAULT 0,            		--
   fk_pays                  integer        DEFAULT 0,            		--
-  fk_account               integer        DEFAULT 0,            		--
+  fk_account               integer        DEFAULT 0,            		-- default bank account
   phone                    varchar(20),                         		-- phone number
   fax                      varchar(20),                         		-- fax number
   url                      varchar(255),                        		--
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8f9c4aa302f..3f12a36283f 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1881,7 +1881,7 @@ SuppliersInvoiceNumberingModel=Vendor invoices numbering models
 IfSetToYesDontForgetPermission=If set to a non null value, don't forget to provide permissions to groups or users allowed for the second approval
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP Maxmind module setup
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation
 NoteOnPathLocation=Note that your ip to country data file must be inside a directory your PHP can read (Check your PHP open_basedir setup and filesystem permissions).
 YouCanDownloadFreeDatFileTo=You can download a <b>free demo version</b> of the Maxmind GeoIP country file at %s.
 YouCanDownloadAdvancedDatFileTo=You can also download a more <b>complete version, with updates,</b> of the Maxmind GeoIP country file at %s.
@@ -1932,7 +1932,7 @@ BackupDumpWizard=Wizard to build the database dump file
 BackupZipWizard=Wizard to build the archive of documents directory
 SomethingMakeInstallFromWebNotPossible=Installation of external module is not possible from the web interface for the following reason:
 SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
-InstallModuleFromWebHasBeenDisabledContactUs=Install of external modules from the application is currently locked. Please contact us if you need us to enable this feature.
+InstallModuleFromWebHasBeenDisabledContactUs=Install or development of external modules from the application is currently locked for security purpose. Please contact us if you need to enable this feature.
 InstallModuleFromWebHasBeenDisabledByFile=Install of external module from application has been disabled by your administrator. You must ask him to remove the file <strong>%s</strong> to allow this feature.
 ConfFileMustContainCustom=Installing or building an external module from application need to save the module files into directory <strong>%s</strong>. To have this directory processed by Dolibarr, you must setup your <strong>conf/conf.php</strong> to add the 2 directive lines:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index b6001b2b27b..67dfb75a242 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -240,7 +240,7 @@ OppStatusPENDING=Pending
 OppStatusWON=Won
 OppStatusLOST=Lost
 Budget=Budget
-AllowToLinkFromOtherCompany=Allow to link project from other company<br><br><u>Supported values:</u><br>- Keep empty: Can link any project of the company (default)<br>- "all": Can link any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link all projects of these third partys (Example: 123,4795,53)<br>
+AllowToLinkFromOtherCompany=Allow to link an element with a project of other company<br><br><u>Supported values:</u><br>- Keep empty: Can link elements with any projects in the same company (default)<br>- "all": Can link elements with any projects, even projects of other companies<br>- A list of third-party ids separated by commas: can link elements with any projects of these third partys (Example: 123,4795,53)<br>
 LatestProjects=Latest %s projects
 LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
@@ -284,7 +284,7 @@ ProfitIsCalculatedWith=Profit is calculated using
 AddPersonToTask=Add also to tasks
 UsageOrganizeEvent=Usage: Event Organization
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classify project as closed when all its tasks are completed (100%% progress)
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks at 100 %% progress won't be affected: you will have to close them manually. This option only affects open projects.
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with all tasks already set to a progress of 100 %% won't be affected: you will have to close them manually. This option only affects open projects.
 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>.
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index 874cdc76f28..742e3afff67 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -153,3 +153,5 @@ PreviousContainer=Previous page/container
 WebsiteMustBeDisabled=The website must have the status "%s"
 WebpageMustBeDisabled=The web page must have the status "%s"
 SetWebsiteOnlineBefore=When website is offline, all pages are offline. Change status of website first.
+Booking=Booking
+Reservation=Reservation
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 32d442008eb..4b580e7b808 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1484,7 +1484,7 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 
 	// Referrer-Policy
 	// Say if we must provide the referrer when we jump onto another web page.
-	// Default browser are 'strict-origin-when-cross-origin', we want more so we use 'same-origin' so we don't send any referrer when going into another web site
+	// Default browser are 'strict-origin-when-cross-origin' (only domain is sent on other domain switching), we want more so we use 'same-origin' so browser doesn't send any referrer when going into another web site domain.
 	if (!defined('MAIN_SECURITY_FORCERP')) {
 		$referrerpolicy = getDolGlobalString('MAIN_SECURITY_FORCERP', "same-origin");
 
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index 79f6f578e5f..03515c9a2e2 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -58,10 +58,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/conf.class.php';
 $conf = new Conf();
 
 // Set properties specific to database
-$conf->db->host = $dolibarr_main_db_host;
-$conf->db->port = $dolibarr_main_db_port;
-$conf->db->name = $dolibarr_main_db_name;
-$conf->db->user = $dolibarr_main_db_user;
+$conf->db->host = empty($dolibarr_main_db_host) ? '' : $dolibarr_main_db_host;
+$conf->db->port = empty($dolibarr_main_db_port) ? '' : $dolibarr_main_db_port;
+$conf->db->name = empty($dolibarr_main_db_name) ? '' : $dolibarr_main_db_name;
+$conf->db->user = empty($dolibarr_main_db_user) ? '' : $dolibarr_main_db_user;
 $conf->db->pass = empty($dolibarr_main_db_pass) ? '' : $dolibarr_main_db_pass;
 $conf->db->type = $dolibarr_main_db_type;
 $conf->db->prefix = $dolibarr_main_db_prefix;
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 29959822af1..538b1cac290 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -1974,6 +1974,28 @@ if ($message) {
 $infomodulesfound = '<div style="padding: 12px 9px 12px">'.$form->textwithpicto('', $langs->trans("ModuleBuilderDesc3", count($listofmodules)).'<br><br>'.$langs->trans("ModuleBuilderDesc4", $FILEFLAG).'<br>'.$textforlistofdirs).'</div>';
 
 
+
+$dolibarrdataroot = preg_replace('/([\\/]+)$/i', '', DOL_DATA_ROOT);
+$allowonlineinstall = true;
+if (dol_is_file($dolibarrdataroot.'/installmodules.lock')) {
+	$allowonlineinstall = false;
+}
+if (empty($allowonlineinstall)) {
+	if (getDolGlobalString('MAIN_MESSAGE_INSTALL_MODULES_DISABLED_CONTACT_US')) {
+		// Show clean message
+		$message = info_admin($langs->trans('InstallModuleFromWebHasBeenDisabledContactUs'));
+	} else {
+		// Show technical message
+		$message = info_admin($langs->trans("InstallModuleFromWebHasBeenDisabledByFile", $dolibarrdataroot.'/installmodules.lock'), 0, 0, 1, 'warning');
+	}
+
+	print $message;
+
+	llxFooter();
+	exit(0);
+}
+
+
 // Load module descriptor
 $error = 0;
 $moduleobj = null;
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 46967d6e4fa..b7dfc374a52 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -119,7 +119,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
@@ -158,7 +158,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$texte .= $conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.dol_escape_htmltag($langs->trans("Modify")).'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -172,18 +172,16 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		}
 
 		if ($nbofiles) {
-			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
+			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'];
-				$texte .= ' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mymodule_myobject/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
-				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=COMPANY_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=mymodule_myobject/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a>';
+				$texte .= ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?modulepart=doctemplates&keyforuploaddir=MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH&action=deletefile&token='.newToken().'&file='.urlencode(basename($file['name'])).'">'.img_picto('', 'delete').'</a>';
 				$texte .= '<br>';
 			}
 			$texte .= '</div>';
 		}
 
-		$texte .= '</td>';
-
 		// Add input to upload a new template file.
 		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
 		$maxfilesizearray = getMaxFileSizeArray();
@@ -195,6 +193,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$texte .= '<input type="hidden" value="MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
+
 		$texte .= '</td>';
 
 		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
@@ -282,8 +281,10 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+
 				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
@@ -308,7 +309,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					return -1;
 				}
 
-				// If CUSTOMER contact defined on order, we use it
+				// If CUSTOMER contact defined on object, we use it
 				$usecontact = false;
 				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 				if (count($arrayidcontact) > 0) {
@@ -348,7 +349,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 
 				// Line of free text
 				$newfreetext = '';
-				$paramfreetext = 'ORDER_FREE_TEXT';
+				$paramfreetext = 'MYMODULE_MYOBJECT_FREE_TEXT';
 				if (!empty($conf->global->$paramfreetext)) {
 					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 				}
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 32571252ebf..aa3381c1242 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -731,7 +731,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false, 'MOChild');
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false);
 
 
 		print '</div><div class="fichehalfright">';
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index f7a6ed88571..e62b8223fcb 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -450,7 +450,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -460,6 +460,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -505,16 +512,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -539,7 +552,9 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 print '</tr>'."\n";
 
 
@@ -570,6 +585,18 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Show here line of result
 	print '<tr class="oddeven">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -627,15 +654,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index 3b8c3f2ecaa..84ca487b771 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -39,48 +39,79 @@ $langs->load("bom");
 $total = 0;
 $ilink = 0;
 
-$mo_static = new Mo($db);
-$res = $mo_static->fetch($object->id);
-$TMoChilds = $mo_static->getMoChilds();
-$hookmanager->initHooks('LinesLinkedObjectBlock');
-$parameters = array('TMoChilds' => $TMoChilds);
-$reshook = $hookmanager->executeHooks('LinesLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) {
-	foreach ($TMoChilds as $key => $objectlink) {
+if ($object->element == 'mo') {
+	$mo_static = new Mo($db);
+	$res = $mo_static->fetch($object->id);
+	$TMoChilds = $mo_static->getMoChilds();
+
+	$hookmanager->initHooks('LinesLinkedObjectBlock');
+	$parameters = array('TMoChilds' => $TMoChilds);
+	$reshook = $hookmanager->executeHooks('LinesLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		foreach ($TMoChilds as $key => $objectlink) {
+			$ilink++;
+
+			$trclass = 'oddeven';
+
+			echo '<tr class="' . $trclass . '" >';
+			echo '<td class="linkedcol-element" >' . $langs->trans("ManufacturingOrder");
+			if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
+				print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, 1) . '&amp;action=selectlines" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '"  > <i class="fa fa-indent"></i> </a';
+			}
+			echo '</td>';
+			echo '<td class="linkedcol-name nowraponall" >' . $objectlink->getNomUrl(1) . '</td>';
+
+			echo '<td class="linkedcol-ref" align="center">';
+			//  $result = $product_static->fetch($objectlink->fk_product);
+			print '</td>';
+			echo '<td class="linkedcol-date" align="center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>';
+			echo '<td class="linkedcol-amount right">-</td>';
+			echo '<td class="linkedcol-statut right">' . $objectlink->getLibStatut(3) . '</td>';
+			echo '<td class="linkedcol-action right">';
+
+			// we want to make the link via element_element for delete action
+			$sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
+			$sql .= " WHERE  fk_source = " . (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) . "'";
+
+			$resql = $db->query($sql);
+			$k = 0;
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				if ($obj->rowid && $obj->rowid > 0) $k = $obj->rowid;
+			}
+			echo '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&token=' . newToken() . '&dellinkid=' . $k . '">' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '</a>';
+			echo '</td>';
+			echo "</tr>\n";
+		}
+	}
+} else {
+	$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
+
+	$total = 0;
+	$ilink = 0;
+	foreach ($linkedObjectBlock as $key => $objectlink) {
 		$ilink++;
 
 		$trclass = 'oddeven';
-
-		echo '<tr class="' . $trclass . '" >';
-		echo '<td class="linkedcol-element" >' . $langs->trans("ManufacturingOrder");
+		if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
+			$trclass .= ' liste_sub_total';
+		}
+		print '<tr class="'.$trclass.'"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
+		print '<td class="linkedcol-element" >'.$langs->trans("ManufacturingOrder");
 		if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
-			print '<a class="objectlinked_importbtn" href="' . $objectlink->getNomUrl(0, '', 0, 1) . '&amp;action=selectlines" data-element="' . $objectlink->element . '" data-id="' . $objectlink->id . '"  > <i class="fa fa-indent"></i> </a';
+			$url = DOL_URL_ROOT.'/mrp/mo_card.php?id='.$objectlink->id;
+			print '<a class="objectlinked_importbtn" href="'.$url.'&amp;action=selectlines"  data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a>';
 		}
-		echo '</td>';
-		echo '<td class="linkedcol-name nowraponall">'.$objectlink->getNomUrl(1).'</td>';
-
-		echo '<td class="linkedcol-ref" align="center">';
-		//  $result = $product_static->fetch($objectlink->fk_product);
 		print '</td>';
-		echo '<td class="linkedcol-date" align="center">' . dol_print_date($objectlink->date_creation, 'day') . '</td>';
-		echo '<td class="linkedcol-amount right">-</td>';
-		echo '<td class="linkedcol-statut right">' . $objectlink->getLibStatut(3) . '</td>';
-		echo '<td class="linkedcol-action right">';
 
-		// we want to make the link via element_element for delete action
-		$sql = " Select rowid from " . MAIN_DB_PREFIX . "element_element";
-		$sql .= " WHERE  fk_source = ". (int) $object->id . " and fk_target = '" . dol_escape_htmltag($key) ."'";
-
-		$resql = $db->query($sql);
-		$k = 0;
-		if ($resql) {
-			$obj = $db->fetch_object($resql);
-			if ($obj->rowid && $obj->rowid > 0 ) $k = $obj->rowid;
-		}
-		echo '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=dellink&token=' . newToken() . '&dellinkid=' . $k . '">' . img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink') . '</a>';
-
-		echo '</td>';
-		echo "</tr>\n";
+		print '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+		print '<td class="linkedcol-ref" >'.$objectlink->ref_client.'</td>';
+		print '<td class="linkedcol-date center">'.dol_print_date($objectlink->date_start_planned, 'day').'</td>';
+		print '<td class="linkedcol-amount right">-</td>';
+		print '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+		print '<td class="linkedcol-action right"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&token='.newToken().'&dellinkid='.$key.'">'.img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink').'</a></td>';
+		print "</tr>\n";
 	}
 }
+
 echo "<!-- END PHP TEMPLATE -->\n";
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index 44241007dfb..e03ee278574 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -327,6 +327,13 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 print '<td class="liste_titre"><input type="text" class="maxwidth100" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
 print '<td class="liste_titre"><input type="text" class="maxwidth100onsmartphone" name="search_title" value="'.dol_escape_htmltag($search_title).'"></td>';
 print '<td class="liste_titre"></td>';
@@ -344,16 +351,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+}
 print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.id_sondage", $param, "", "", $sortfield, $sortorder);
 print_liste_field_titre("Title", $_SERVER["PHP_SELF"], "p.titre", $param, "", "", $sortfield, $sortorder);
 print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "p.format", $param, "", "", $sortfield, $sortorder);
@@ -369,7 +382,9 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+}
 print '</tr>'."\n";
 
 
@@ -402,7 +417,18 @@ while ($i < min($num, $limit)) {
 
 	// Show here line of result
 	print '<tr class="oddeven">';
-
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	// Ref
 	print '<td>';
 	print $opensurvey_static->getNomUrl(1);
@@ -478,15 +504,17 @@ while ($i < min($num, $limit)) {
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 5eae5c45dc9..7182dd45f31 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -270,10 +270,13 @@ if (empty($reshook)) {
 				if ($ret == -3) {
 					$error++;
 
-					$object->fetch($object->product_id_already_linked);
-					$productLink = $object->getNomUrl(1, 'supplier');
+					$tmpobject = new Product($db);
+					$tmpobject->fetch($object->product_id_already_linked);
+					$productLink = $tmpobject->getNomUrl(1, 'supplier');
 
-					setEventMessages($langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct", $productLink), null, 'errors');
+					$texttoshow = $langs->trans("ReferenceSupplierIsAlreadyAssociatedWithAProduct", '{s1}');
+					$texttoshow = str_replace('{s1}', $productLink, $texttoshow);
+					setEventMessages($texttoshow, null, 'errors');
 				} elseif ($ret < 0) {
 					$error++;
 					setEventMessages($object->error, $object->errors, 'errors');
@@ -995,52 +998,72 @@ END;
 
 				$param = "&id=".$object->id;
 
+				$nbfields = 0;
+
 				print '<tr class="liste_titre">';
 				if (!empty($arrayfields['pfp.datec']['checked'])) {
 					print_liste_field_titre("AppliedPricesFrom", $_SERVER["PHP_SELF"], "pfp.datec", "", $param, "", $sortfield, $sortorder, '', '', 1);
+					$nbfields++;
 				}
 				if (!empty($arrayfields['s.nom']['checked'])) {
 					print_liste_field_titre("Suppliers", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder, '', '', 1);
+					$nbfields++;
 				}
 				print_liste_field_titre("SupplierRef", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder, '', '', 1);
+				$nbfields++;
 				if (!empty($arrayfields['pfp.fk_availability']['checked'])) {
 					print_liste_field_titre("Availability", $_SERVER["PHP_SELF"], "pfp.fk_availability", "", $param, "", $sortfield, $sortorder);
+					$nbfields++;
 				}
 				if (!empty($arrayfields['pfp.quantity']['checked'])) {
 					print_liste_field_titre("QtyMin", $_SERVER["PHP_SELF"], "pfp.quantity", "", $param, '', $sortfield, $sortorder, 'right ');
+					$nbfields++;
 				}
 				print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+				$nbfields++;
 				print_liste_field_titre("PriceQtyMinHT", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+				$nbfields++;
 				if (isModEnabled("multicurrency")) {
 					print_liste_field_titre("PriceQtyMinHTCurrency", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+					$nbfields++;
 				}
 				if (!empty($arrayfields['pfp.unitprice']['checked'])) {
 					print_liste_field_titre("UnitPriceHT", $_SERVER["PHP_SELF"], "pfp.unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+					$nbfields++;
 				}
 				if (!empty($arrayfields['pfp.multicurrency_unitprice']['checked'])) {
 					print_liste_field_titre("UnitPriceHTCurrency", $_SERVER["PHP_SELF"], "pfp.multicurrency_unitprice", "", $param, '', $sortfield, $sortorder, 'right ');
+					$nbfields++;
 				}
 				if (isModEnabled("multicurrency")) {
 					print_liste_field_titre("Currency", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'right ');
+					$nbfields++;
 				}
 				print_liste_field_titre("DiscountQtyMin", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'right ');
+				$nbfields++;
 				if (!empty($arrayfields['pfp.delivery_time_days']['checked'])) {
 					print_liste_field_titre("NbDaysToDelivery", $_SERVER["PHP_SELF"], "pfp.delivery_time_days", "", $param, '', $sortfield, $sortorder, 'right ');
+					$nbfields++;
 				}
 				if (!empty($arrayfields['pfp.supplier_reputation']['checked'])) {
 					print_liste_field_titre("ReputationForThisProduct", $_SERVER["PHP_SELF"], "pfp.supplier_reputation", "", $param, '', $sortfield, $sortorder, 'center ');
+					$nbfields++;
 				}
 				if (!empty($arrayfields['pfp.fk_barcode_type']['checked'])) {
 					print_liste_field_titre("BarcodeType", $_SERVER["PHP_SELF"], "pfp.fk_barcode_type", "", $param, '', $sortfield, $sortorder, 'center ');
+					$nbfields++;
 				}
 				if (!empty($arrayfields['pfp.barcode']['checked'])) {
 					print_liste_field_titre("BarcodeValue", $_SERVER["PHP_SELF"], "pfp.barcode", "", $param, '', $sortfield, $sortorder, 'center ');
+					$nbfields++;
 				}
 				if (!empty($arrayfields['pfp.packaging']['checked'])) {
 					print_liste_field_titre("PackagingForThisProduct", $_SERVER["PHP_SELF"], "pfp.packaging", "", $param, 'align="center"', $sortfield, $sortorder);
+					$nbfields++;
 				}
 				if (!empty($arrayfields['pfp.tms']['checked'])) {
 					print_liste_field_titre("DateModification", $_SERVER["PHP_SELF"], "pfp.tms", "", $param, '', $sortfield, $sortorder, 'right ', '', 1);
+					$nbfields++;
 				}
 
 				// fetch optionals attributes and labels
@@ -1062,6 +1085,7 @@ END;
 								}
 								if (!empty($arrayfields['ef.' . $key]['checked'])) {
 									print_liste_field_titre($extratitle, $_SERVER["PHP_SELF"], 'ef.' . $key, '', $param, '', $sortfield, $sortorder, 'right ');
+									$nbfields++;
 								}
 							}
 						}
@@ -1069,10 +1093,11 @@ END;
 				}
 
 				if (is_object($hookmanager)) {
-					$parameters = array('id_fourn'=>(!empty($id_fourn)?$id_fourn:''), 'prod_id'=>$object->id);
+					$parameters = array('id_fourn'=>(!empty($id_fourn)?$id_fourn:''), 'prod_id'=>$object->id, 'nbfields'=>$nbfields);
 					$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action);
 				}
 				print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+				$nbfields++;
 				print "</tr>\n";
 
 				if (is_array($product_fourn_list)) {
@@ -1254,6 +1279,10 @@ END;
 
 						print '</tr>';
 					}
+
+					if (empty($product_fourn_list)) {
+						print '<tr><td colspan="'.$nbfields.'"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+					}
 				} else {
 					dol_print_error($db);
 				}
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 18104118068..68a08d37959 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -474,7 +474,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -484,6 +484,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -522,16 +529,22 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -554,7 +567,9 @@ $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 print '</tr>'."\n";
 
 
@@ -584,6 +599,18 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Show here line of result
 	print '<tr class="oddeven">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -636,15 +663,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index e637e478df4..b96a0f6447e 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -176,7 +176,6 @@ if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT)
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array(
 	'p.ref'=>"Ref",
-	'pfp.ref_fourn'=>"RefSupplier",
 	'p.label'=>"ProductLabel",
 	'p.description'=>"Description",
 	"p.note"=>"Note",
@@ -190,7 +189,6 @@ if (getDolGlobalInt('MAIN_MULTILANGS')) {
 }
 if (isModEnabled('barcode')) {
 	$fieldstosearchall['p.barcode'] = 'Gencod';
-	$fieldstosearchall['pfp.barcode'] = 'GencodBuyPrice';
 }
 // Personalized search criterias. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel;p.description=Description;p.note=Note;'
 if (!empty($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS)) {
@@ -459,7 +457,16 @@ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if ($sall) {
-	$sql .= natural_search(array_keys($fieldstosearchall), $sall);
+	$sql .= ' AND (';
+	$sql .= natural_search(array_keys($fieldstosearchall), $sall, 0, 1);
+	// Search also into a supplier reference 'pfp.ref_fourn'="RefSupplier"
+	$sql .= ' OR EXISTS (SELECT rowid FROM '.MAIN_DB_PREFIX.'product_fournisseur_price as pfp WHERE pfp.fk_product = p.rowid';
+	$sql .= ' AND ('.natural_search('pfp.ref_fourn', $sall, 0, 1);
+	if (isModEnabled('barcode')) {
+		// Search also into a supplier barcode 'pfp.barcode'='GencodBuyPrice';
+		$sql .= ' OR '.natural_search('pfp.barcode', $sall, 0, 1);
+	}
+	$sql .= ')))';
 }
 // if the type is not 1, we show all products (type = 0,2,3)
 if (dol_strlen($search_type) && $search_type != '-1') {
@@ -1338,49 +1345,54 @@ while ($i < min($num, $limit)) {
 			}
 		}
 	}
+	$parameters = array('staticdata' => $obj);
+	// Note that $action and $object may have been modified by hook
+	// do product_static fetch in hook if wanted or anything else
+	$reshook = $hookmanager->executeHooks('loadStaticObject', $parameters, $product_static, $action);
+	if (empty($reshook)) {
+		$product_static->id = $obj->rowid;
+		$product_static->ref = $obj->ref;
+		$product_static->ref_fourn = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; // deprecated
+		$product_static->ref_supplier = empty($obj->ref_supplier) ? '' : $obj->ref_supplier;
+		$product_static->label = $obj->label;
+		$product_static->finished = $obj->finished;
+		$product_static->type = $obj->fk_product_type;
+		$product_static->status_buy = $obj->tobuy;
+		$product_static->status = $obj->tosell;
+		$product_static->status_batch = $obj->tobatch;
+		$product_static->entity = $obj->entity;
+		$product_static->pmp = $obj->pmp;
+		$product_static->accountancy_code_sell = $obj->accountancy_code_sell;
+		$product_static->accountancy_code_sell_export = $obj->accountancy_code_sell_export;
+		$product_static->accountancy_code_sell_intra = $obj->accountancy_code_sell_intra;
+		$product_static->accountancy_code_buy = $obj->accountancy_code_buy;
+		$product_static->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
+		$product_static->accountancy_code_buy_export = $obj->accountancy_code_buy_export;
+		$product_static->length = $obj->length;
+		$product_static->length_units = $obj->length_units;
+		$product_static->width = $obj->width;
+		$product_static->width_units = $obj->width_units;
+		$product_static->height = $obj->height;
+		$product_static->height_units = $obj->height_units;
+		$product_static->weight = $obj->weight;
+		$product_static->weight_units = $obj->weight_units;
+		$product_static->volume = $obj->volume;
+		$product_static->volume_units = $obj->volume_units;
+		$product_static->surface = $obj->surface;
+		$product_static->surface_units = $obj->surface_units;
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$product_static->fk_unit = $obj->fk_unit;
+		}
 
-	$product_static->id = $obj->rowid;
-	$product_static->ref = $obj->ref;
-	$product_static->ref_fourn = empty($obj->ref_supplier) ? '' : $obj->ref_supplier; // deprecated
-	$product_static->ref_supplier = empty($obj->ref_supplier) ? '' : $obj->ref_supplier;
-	$product_static->label = $obj->label;
-	$product_static->finished = $obj->finished;
-	$product_static->type = $obj->fk_product_type;
-	$product_static->status_buy = $obj->tobuy;
-	$product_static->status     = $obj->tosell;
-	$product_static->status_batch = $obj->tobatch;
-	$product_static->entity = $obj->entity;
-	$product_static->pmp = $obj->pmp;
-	$product_static->accountancy_code_sell = $obj->accountancy_code_sell;
-	$product_static->accountancy_code_sell_export = $obj->accountancy_code_sell_export;
-	$product_static->accountancy_code_sell_intra = $obj->accountancy_code_sell_intra;
-	$product_static->accountancy_code_buy = $obj->accountancy_code_buy;
-	$product_static->accountancy_code_buy_intra = $obj->accountancy_code_buy_intra;
-	$product_static->accountancy_code_buy_export = $obj->accountancy_code_buy_export;
-	$product_static->length = $obj->length;
-	$product_static->length_units = $obj->length_units;
-	$product_static->width = $obj->width;
-	$product_static->width_units = $obj->width_units;
-	$product_static->height = $obj->height;
-	$product_static->height_units = $obj->height_units;
-	$product_static->weight = $obj->weight;
-	$product_static->weight_units = $obj->weight_units;
-	$product_static->volume = $obj->volume;
-	$product_static->volume_units = $obj->volume_units;
-	$product_static->surface = $obj->surface;
-	$product_static->surface_units = $obj->surface_units;
-	if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-		$product_static->fk_unit = $obj->fk_unit;
-	}
-
-	// STOCK_DISABLE_OPTIM_LOAD can be set to force load_stock whatever is permissions on stock.
-	if ((isModEnabled('stock') && $user->rights->stock->lire && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) {	// To optimize call of load_stock
-		if ($obj->fk_product_type != 1 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {    // Not a service
-			$option = 'nobatch';
-			if (empty($arrayfields['stock_virtual']['checked'])) {
-				$option .= ',novirtual';
+		// STOCK_DISABLE_OPTIM_LOAD can be set to force load_stock whatever is permissions on stock.
+		if ((isModEnabled('stock') && $user->rights->stock->lire && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) {	// To optimize call of load_stock
+			if ($product_static->type != 1 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {    // Not a service
+				$option = 'nobatch';
+				if (empty($arrayfields['stock_virtual']['checked'])) {
+					$option .= ',novirtual';
+				}
+				$product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
 			}
-			$product_static->load_stock($option); // Load stock_reel + stock_warehouse. This can also call load_virtual_stock()
 		}
 	}
 
@@ -1454,7 +1466,7 @@ while ($i < min($num, $limit)) {
 
 	// Label
 	if (!empty($arrayfields['p.label']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($product_static->label).'">'.$product_static->label.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1464,7 +1476,7 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['p.fk_product_type']['checked'])) {
 		print '<td class="center">';
 		$s = '';
-		if ($obj->fk_product_type == 0) {
+		if ($product_static->type == 0) {
 			$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
 		} else {
 			$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
@@ -1478,7 +1490,7 @@ while ($i < min($num, $limit)) {
 
 	// Barcode
 	if (!empty($arrayfields['p.barcode']['checked'])) {
-		print '<td>'.$obj->barcode.'</td>';
+		print '<td>'.$product_static->barcode.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1522,7 +1534,7 @@ while ($i < min($num, $limit)) {
 	// Weight
 	if (!empty($arrayfields['p.weight']['checked'])) {
 		print '<td class="center">';
-		print $obj->weight;
+		print $product_static->weight;
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1542,7 +1554,7 @@ while ($i < min($num, $limit)) {
 	// Length
 	if (!empty($arrayfields['p.length']['checked'])) {
 		print '<td class="center">';
-		print $obj->length;
+		print $product_static->length;
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1562,7 +1574,7 @@ while ($i < min($num, $limit)) {
 	// Width
 	if (!empty($arrayfields['p.width']['checked'])) {
 		print '<td align="center">';
-		print $obj->width;
+		print $product_static->width;
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1582,7 +1594,7 @@ while ($i < min($num, $limit)) {
 	// Height
 	if (!empty($arrayfields['p.height']['checked'])) {
 		print '<td align="center">';
-		print $obj->height;
+		print $product_static->height;
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1602,7 +1614,7 @@ while ($i < min($num, $limit)) {
 	// Surface
 	if (!empty($arrayfields['p.surface']['checked'])) {
 		print '<td class="center">';
-		print $obj->surface;
+		print $product_static->surface;
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1622,7 +1634,7 @@ while ($i < min($num, $limit)) {
 	// Volume
 	if (!empty($arrayfields['p.volume']['checked'])) {
 		print '<td class="center">';
-		print $obj->volume;
+		print $product_static->volume;
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1654,7 +1666,7 @@ while ($i < min($num, $limit)) {
 	// Sell price
 	if (!empty($arrayfields['p.sellprice']['checked'])) {
 		print '<td class="right nowraponall">';
-		if ($obj->tosell && $usercancreadprice) {
+		if ($product_static->status && $usercancreadprice) {
 			if ($obj->price_base_type == 'TTC') {
 				print '<span class="amount">'.price($obj->price_ttc).' '.$langs->trans("TTC").'</span>';
 			} else {
@@ -1677,7 +1689,7 @@ while ($i < min($num, $limit)) {
 			$productpricescache[$obj->rowid] = array();
 		}
 
-		if ($obj->tosell && $usercancreadprice) {
+		if ($product_static->status && $usercancreadprice) {
 			// Make 1 request for all price levels (without filter on price_level) and saved result into an cache array
 			// then reuse the cache array if we need prices for other price levels
 			$sqlp = "SELECT p.rowid, p.fk_product, p.price, p.price_ttc, p.price_level, p.date_price, p.price_base_type";
@@ -1727,7 +1739,7 @@ while ($i < min($num, $limit)) {
 	// Better buy price
 	if (!empty($arrayfields['p.minbuyprice']['checked'])) {
 		print  '<td class="right nowraponall">';
-		if ($obj->tobuy && $obj->bestpurchaseprice != '' && $usercancreadprice) {
+		if ($product_static->status_buy && $obj->bestpurchaseprice != '' && $usercancreadprice) {
 			if ($product_fourn->find_min_price_product_fournisseur($obj->rowid) > 0) {
 				if ($product_fourn->product_fourn_price_id > 0) {
 					if ((isModEnabled("fournisseur") && !empty($user->rights->fournisseur->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled("supplier_order") && !empty($user->rights->supplier_order->lire)) || (isModEnabled("supplier_invoice") && !empty($user->rights->supplier_invoice->lire))) {
@@ -1748,7 +1760,7 @@ while ($i < min($num, $limit)) {
 	// Number of buy prices
 	if (!empty($arrayfields['p.numbuyprice']['checked'])) {
 		print  '<td class="right">';
-		if ($obj->tobuy && $usercancreadprice) {
+		if ($product_static->status_buy && $usercancreadprice) {
 			if (count($productFournList = $product_fourn->list_product_fournisseur_price($obj->rowid)) > 0) {
 				$htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1, $productFournList);
 				print $form->textwithpicto(count($productFournList), $htmltext);
@@ -1788,7 +1800,7 @@ while ($i < min($num, $limit)) {
 	// Limit alert
 	if (!empty($arrayfields['p.seuil_stock_alerte']['checked'])) {
 		print '<td class="right">';
-		if ($obj->fk_product_type != 1) {
+		if ($product_static->type != 1) {
 			print $obj->seuil_stock_alerte;
 		}
 		print '</td>';
@@ -1799,7 +1811,7 @@ while ($i < min($num, $limit)) {
 	// Desired stock
 	if (!empty($arrayfields['p.desiredstock']['checked'])) {
 		print '<td class="right">';
-		if ($obj->fk_product_type != 1) {
+		if ($product_static->type != 1) {
 			print $obj->desiredstock;
 		}
 		print '</td>';
@@ -1810,7 +1822,7 @@ while ($i < min($num, $limit)) {
 	// Stock real
 	if (!empty($arrayfields['p.stock']['checked'])) {
 		print '<td class="right">';
-		if ($obj->fk_product_type != 1) {
+		if ($product_static->type != 1) {
 			if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) {
 				print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
 			}
@@ -1826,7 +1838,7 @@ while ($i < min($num, $limit)) {
 	// Stock virtual
 	if (!empty($arrayfields['stock_virtual']['checked'])) {
 		print '<td class="right">';
-		if ($obj->fk_product_type != 1) {
+		if ($product_static->type != 1) {
 			if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) {
 				print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';
 			}
@@ -1868,38 +1880,38 @@ while ($i < min($num, $limit)) {
 	}
 	// Accountancy code sell
 	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell']['checked'])) {
-		print '<td>'.$obj->accountancy_code_sell.'</td>';
+		print '<td>'.$product_static->accountancy_code_sell.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_intra']['checked'])) {
-		print '<td>'.$obj->accountancy_code_sell_intra.'</td>';
+		print '<td>'.$product_static->accountancy_code_sell_intra.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_sell_export']['checked'])) {
-		print '<td>'.$obj->accountancy_code_sell_export.'</td>';
+		print '<td>'.$product_static->accountancy_code_sell_export.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Accountancy code buy
 	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy']['checked'])) {
-		print '<td>'.$obj->accountancy_code_buy.'</td>';
+		print '<td>'.$product_static->accountancy_code_buy.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_intra']['checked'])) {
-		print '<td>'.$obj->accountancy_code_buy_intra.'</td>';
+		print '<td>'.$product_static->accountancy_code_buy_intra.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields[$alias_product_perentity . '.accountancy_code_buy_export']['checked'])) {
-		print '<td>'.$obj->accountancy_code_buy_export.'</td>';
+		print '<td>'.$product_static->accountancy_code_buy_export.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1935,7 +1947,7 @@ while ($i < min($num, $limit)) {
 		if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 			print ajax_object_onoff($product_static, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');
 		} else {
-			print $product_static->LibStatut($obj->tosell, 5, 0);
+			print $product_static->LibStatut($product_static->status, 5, 0);
 		}
 		print '</td>';
 		if (!$i) {
@@ -1948,7 +1960,7 @@ while ($i < min($num, $limit)) {
 		if (!empty($conf->use_javascript_ajax) && $user->hasRight("produit", "creer") && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {
 			print ajax_object_onoff($product_static, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');
 		} else {
-			print $product_static->LibStatut($obj->tobuy, 5, 1);
+			print $product_static->LibStatut($product_static->status_buy, 5, 1);
 		}
 		print '</td>';
 		if (!$i) {
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index d7005fa439a..ca69f12170d 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1217,9 +1217,9 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {    // TODO Fix the form inside tr instead of td
 		print '<tr><td>'.$langs->trans("PriceByQuantity");
 		if ($object->prices_by_qty[0] == 0) {
-			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1">('.$langs->trans("Activate").')';
+			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=activate_price_by_qty&level=1&token='.newToken().'">('.$langs->trans("Activate").')';
 		} else {
-			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable_price_by_qty&level=1">('.$langs->trans("DisablePriceByQty").')';
+			print '&nbsp; <a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=disable_price_by_qty&level=1&token='.newToken().'">('.$langs->trans("DisablePriceByQty").')';
 		}
 		print '</td><td>';
 
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index ed7b7e3e77f..c5b27a00c20 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -147,7 +147,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
-$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON s.fk_entrepot = e.rowid AND e.entity IN ('.getEntity('entrepot').')';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'entrepot as e ON s.fk_entrepot = e.rowid AND e.entity IN ('.getEntity('stock').')';
 if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_units as u on p.fk_unit = u.rowid';
 }
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index b751d8d1e8e..ef04862eb71 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -2203,7 +2203,7 @@ class Task extends CommonObjectLine
 		$sql .= " t.rowid as taskid, t.progress as progress, t.fk_statut as status,";
 		$sql .= " t.dateo as date_start, t.datee as datee";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
+		//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 		//if (! $user->rights->societe->client->voir && ! $socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
 		$sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
 		$sql .= " WHERE p.entity IN (".getEntity('project', 0).')';
diff --git a/htdocs/projet/class/taskstats.class.php b/htdocs/projet/class/taskstats.class.php
index a5b088f01e8..5794d585101 100644
--- a/htdocs/projet/class/taskstats.class.php
+++ b/htdocs/projet/class/taskstats.class.php
@@ -193,4 +193,35 @@ class TaskStats extends Stats
 		// var_dump($res);print '<br>';
 		return $res;
 	}
+
+
+		/**
+	 * Return the Task amount by month for a year
+	 *
+	 * @param 	int 	$year 		Year to scan
+	 * @param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 * @return 	array 				Array with amount by month
+	 */
+	public function getAmountByMonth($year, $format = 0)
+	{
+		// Return an empty array at the moment because task has no amount
+		return array();
+	}
+
+		/**
+	 * Return average of entity by month
+	 * @param	int     $year           year number
+	 * @return 	int						value
+	 */
+	protected function getAverageByMonth($year)
+	{
+		$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
+		$sql .= " FROM ".$this->from;
+		$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
+		$sql .= " AND ".$this->where;
+		$sql .= " GROUP BY dm";
+		$sql .= $this->db->order('dm', 'DESC');
+
+		return $this->_getAverageByMonth($year, $sql);
+	}
 }
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index 17eadfe4e17..0b6896260c2 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -54,6 +54,7 @@ $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected i
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'timespentlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss	= GETPOST('optioncss', 'alpha');
+$mode       = GETPOST('mode', 'alpha');
 
 $id			= GETPOST('id', 'int');
 $projectid	= GETPOST('projectid', 'int');
@@ -323,10 +324,10 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 	}
 }
 
-if ($action == 'confirm_deleteline' && $confirm == "yes" && $user->rights->projet->supprimer) {
-	$object->fetchTimeSpent(GETPOST('lineid', 'int'));	// load properties like $object->timespent_id
+if ($action == 'confirm_deleteline' && $confirm == "yes" && ($user->hasRight('projet', 'time') || $user->hasRight('projet', 'all', 'creer'))) {
+	$object->fetchTimeSpent(GETPOST('lineid', 'int'));	// load properties like $object->timespent_xxx
 
-	if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
+	if (in_array($object->timespent_fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
 		$result = $object->delTimeSpent($user);	// delete line with $object->timespent_id
 
 		if ($result < 0) {
@@ -2109,7 +2110,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				print ' ';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
 			} elseif ($user->hasRight('projet', 'time') || $user->hasRight('projet', 'all', 'creer')) {	 // Read project and enter time consumed on assigned tasks
-				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
+				if (in_array($task_time->fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
 					if (getDolGlobalString('MAIN_FEATURES_LEVEL') >= 2) {
 						print '&nbsp;';
 						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=splitline&token='.newToken().'&lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 3354d35c7c1..9346988274a 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -292,137 +292,146 @@ if (empty($reshook) && $action == 'add') {
 			$error++;
 		}
 
-		$result = $adh->create($user);
-		if ($result > 0) {
-			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-			$object = $adh;
+		if (!$error) {
+			$result = $adh->create($user);
+			if ($result > 0) {
+				require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+				$object = $adh;
 
-			$adht = new AdherentType($db);
-			$adht->fetch($object->typeid);
+				$adht = new AdherentType($db);
+				$adht->fetch($object->typeid);
 
-			if ($object->email) {
-				$subject = '';
-				$msg = '';
+				if ($object->email) {
+					$subject = '';
+					$msg = '';
 
-				// Send subscription email
-				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-				$formmail = new FormMail($db);
-				// Set output language
-				$outputlangs = new Translate('', $conf);
-				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
-				// Load traductions files required by page
-				$outputlangs->loadLangs(array("main", "members"));
-				// Get email content from template
-				$arraydefaultmessage = null;
-				$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
+					// Send subscription email
+					include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+					// Set output language
+					$outputlangs = new Translate('', $conf);
+					$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
+					// Load traductions files required by page
+					$outputlangs->loadLangs(array("main", "members"));
+					// Get email content from template
+					$arraydefaultmessage = null;
+					$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_AUTOREGISTER;
 
-				if (!empty($labeltouse)) {
-					$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+					if (!empty($labeltouse)) {
+						$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
+					}
+
+					if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+						$subject = $arraydefaultmessage->topic;
+						$msg     = $arraydefaultmessage->content;
+					}
+
+					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
+					$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
+
+					if ($subjecttosend && $texttosend) {
+						$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
+
+						$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
+					}
+					/*if ($result < 0) {
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}*/
 				}
 
-				if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
-					$subject = $arraydefaultmessage->topic;
-					$msg     = $arraydefaultmessage->content;
-				}
-
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
-				complete_substitutions_array($substitutionarray, $outputlangs, $object);
-				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
-
-				if ($subjecttosend && $texttosend) {
-					$moreinheader = 'X-Dolibarr-Info: send_an_email by public/members/new.php'."\r\n";
-
-					$result = $object->send_an_email($texttosend, $subjecttosend, array(), array(), array(), "", "", 0, -1, '', $moreinheader);
-				}
-				/*if ($result < 0) {
-					$error++;
-					setEventMessages($object->error, $object->errors, 'errors');
-				}*/
-			}
-
-			// Send email to the foundation to say a new member subscribed with autosubscribe form
-			if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
-				  !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL)) {
-				// Define link to login card
-				$appli = constant('DOL_APPLICATION_TITLE');
-				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-					$appli = $conf->global->MAIN_APPLICATION_TITLE;
-					if (preg_match('/\d\.\d/', $appli)) {
-						if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
-							$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+				// Send email to the foundation to say a new member subscribed with autosubscribe form
+				if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL) && !empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
+					!empty($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL)) {
+					// Define link to login card
+					$appli = constant('DOL_APPLICATION_TITLE');
+					if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+						$appli = $conf->global->MAIN_APPLICATION_TITLE;
+						if (preg_match('/\d\.\d/', $appli)) {
+							if (!preg_match('/'.preg_quote(DOL_VERSION).'/', $appli)) {
+								$appli .= " (".DOL_VERSION.")"; // If new title contains a version that is different than core
+							}
+						} else {
+							$appli .= " ".DOL_VERSION;
 						}
 					} else {
 						$appli .= " ".DOL_VERSION;
 					}
+
+					$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
+					$from = $conf->global->ADHERENT_MAIL_FROM;
+					$mailfile = new CMailFile(
+						'['.$appli.'] '.$conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT,
+						$to,
+						$from,
+						$adh->makeSubstitution($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL),
+						array(),
+						array(),
+						array(),
+						"",
+						"",
+						0,
+						-1
+					);
+
+					if (!$mailfile->sendfile()) {
+						dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR);
+					}
+				}
+
+				// Auto-create thirdparty on member creation
+				if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) {
+					$company = new Societe($db);
+					$result = $company->create_from_member($adh);
+					if ($result < 0) {
+						$error++;
+						$errmsg .= join('<br>', $company->errors);
+					}
+				}
+
+				if (!empty($backtopage)) {
+					$urlback = $backtopage;
+				} elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) {
+					$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
+					// TODO Make replacement of __AMOUNT__, etc...
 				} else {
-					$appli .= " ".DOL_VERSION;
+					$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
 				}
 
-				$to = $adh->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
-				$from = $conf->global->ADHERENT_MAIL_FROM;
-				$mailfile = new CMailFile(
-					'['.$appli.'] '.$conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT,
-					$to,
-					$from,
-					$adh->makeSubstitution($conf->global->ADHERENT_AUTOREGISTER_NOTIF_MAIL),
-					array(),
-					array(),
-					array(),
-					"",
-					"",
-					0,
-					-1
-				);
+				if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1') {
+					if (empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {			// If edition of amount not allowed
+						// TODO Check amount is same than the amount required for the type of member or if not defined as the defeault amount into $conf->global->MEMBER_NEWFORM_AMOUNT
+						// It is not so important because a test is done on return of payment validation.
+					}
 
-				if (!$mailfile->sendfile()) {
-					dol_syslog($langs->trans("ErrorFailedToSendMail", $from, $to), LOG_ERR);
-				}
-			}
+					$urlback = getOnlinePaymentUrl(0, 'member', $adh->ref, price2num(GETPOST('amount', 'alpha'), 'MT'), '', 0);
 
-			// Auto-create thirdparty on member creation
-			if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) {
-				$company = new Societe($db);
-				$result = $company->create_from_member($adh);
-				if ($result < 0) {
-					$error++;
-					$errmsg .= join('<br>', $company->errors);
+					if (GETPOST('email')) {
+						$urlback .= '&email='.urlencode(GETPOST('email'));
+					}
+					if ($conf->global->MEMBER_NEWFORM_PAYONLINE != '-1' && $conf->global->MEMBER_NEWFORM_PAYONLINE != 'all') {
+						$urlback .= '&paymentmethod='.urlencode($conf->global->MEMBER_NEWFORM_PAYONLINE);
+					}
+				} else {
+					if (!empty($entity)) {
+						$urlback .= '&entity='.((int) $entity);
+					}
 				}
 			}
 
 			if (!empty($backtopage)) {
 				$urlback = $backtopage;
+				dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
 			} elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) {
 				$urlback = $conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION;
 				// TODO Make replacement of __AMOUNT__, etc...
+				dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
 			} else {
-				$urlback = $_SERVER["PHP_SELF"]."?action=added&token=".newToken();
+				$error++;
+				$errmsg .= join('<br>', $adh->errors);
 			}
-
-			if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) && $conf->global->MEMBER_NEWFORM_PAYONLINE != '-1') {
-				if (empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {			// If edition of amount not allowed
-					// TODO Check amount is same than the amount required for the type of member or if not defined as the defeault amount into $conf->global->MEMBER_NEWFORM_AMOUNT
-					// It is not so important because a test is done on return of payment validation.
-				}
-
-				$urlback = getOnlinePaymentUrl(0, 'member', $adh->ref, price2num(GETPOST('amount', 'alpha'), 'MT'), '', 0);
-
-				if (GETPOST('email')) {
-					$urlback .= '&email='.urlencode(GETPOST('email'));
-				}
-				if ($conf->global->MEMBER_NEWFORM_PAYONLINE != '-1' && $conf->global->MEMBER_NEWFORM_PAYONLINE != 'all') {
-					$urlback .= '&paymentmethod='.urlencode($conf->global->MEMBER_NEWFORM_PAYONLINE);
-				}
-			} else {
-				if (!empty($entity)) {
-					$urlback .= '&entity='.((int) $entity);
-				}
-			}
-
-			dol_syslog("member ".$adh->ref." was created, we redirect to ".$urlback);
-		} else {
-			$error++;
-			$errmsg .= join('<br>', $adh->errors);
 		}
 	}
 
@@ -484,6 +493,7 @@ if (!empty($conf->global->MEMBER_NEWFORM_TEXT)) {
 print '</div>';
 
 dol_htmloutput_errors($errmsg);
+dol_htmloutput_events();
 
 // Print form
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
diff --git a/htdocs/recruitment/class/api_recruitment.class.php b/htdocs/recruitment/class/api_recruitment.class.php
index af2c87dcdb3..cf4fa7a143e 100644
--- a/htdocs/recruitment/class/api_recruitment.class.php
+++ b/htdocs/recruitment/class/api_recruitment.class.php
@@ -441,7 +441,7 @@ class Recruitment extends DolibarrApi
 		// $this->jobposition->abc = sanitizeVal($this->jobposition->abc, 'alphanohtml');
 
 		if ($this->jobposition->update(DolibarrApiAccess::$user, false) > 0) {
-			return $this->get($id);
+			return $this->getJobPosition($id);
 		} else {
 			throw new RestException(500, $this->jobposition->error);
 		}
@@ -484,7 +484,7 @@ class Recruitment extends DolibarrApi
 		// $this->jobposition->abc = sanitizeVal($this->jobposition->abc, 'alphanohtml');
 
 		if ($this->candidature->update(DolibarrApiAccess::$user, false) > 0) {
-			return $this->get($id);
+			return $this->getCandidature($id);
 		} else {
 			throw new RestException(500, $this->candidature->error);
 		}
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index b2edac8dd4d..e6b538b5167 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -446,7 +446,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -456,6 +456,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -501,10 +508,12 @@ if (!empty($arrayfields['nbapplications']['checked'])) {
 	print '<td class="liste_titre"></td>';
 }
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 $totalarray = array();
@@ -513,6 +522,10 @@ $totalarray['nbfield'] = 0;
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -540,7 +553,9 @@ if (!empty($arrayfields['nbapplications']['checked'])) {
 	$totalarray['nbfield']++;
 }
 // Action column
-print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 $totalarray['nbfield']++;
 print '</tr>'."\n";
 
@@ -586,6 +601,18 @@ while ($i < $imaxinloop) {
 		// Show here line of result
 		$j = 0;
 		print '<tr class="oddeven">';
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
 		foreach ($object->fields as $key => $val) {
 			$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 			if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -642,15 +669,17 @@ while ($i < $imaxinloop) {
 			print '<td class="right">'.$obj->nbapplications.'</td>';
 		}
 		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($object->id, $arrayofselected)) {
-				$selected = 1;
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($object->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index 8da7e20e4e5..1fb149ba250 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -2702,23 +2702,24 @@ class Societe extends CommonObject
 		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
 			$label2 .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
 		}
+
 		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP)) {
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) {
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false && $langs->trans('ProfId1'.$this->country_code) != '-') {
 				$label2 .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
 			}
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) {
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false && $langs->trans('ProfId2'.$this->country_code) != '-') {
 				$label2 .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
 			}
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) {
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false && $langs->trans('ProfId3'.$this->country_code) != '-') {
 				$label2 .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
 			}
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) {
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false && $langs->trans('ProfId4'.$this->country_code) != '-') {
 				$label2 .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
 			}
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) {
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false && $langs->trans('ProfId5'.$this->country_code) != '-') {
 				$label2 .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
 			}
-			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) {
+			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false && $langs->trans('ProfId6'.$this->country_code) != '-') {
 				$label2 .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
 			}
 		}
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index dfb5f5ee279..f5fcc56b49d 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -767,7 +767,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
 	$obj = $db->fetch_object($resql);
 	$id = $obj->rowid;
 	if (!empty($conf->global->SOCIETE_ON_SEARCH_AND_LIST_GO_ON_CUSTOMER_OR_SUPPLIER_CARD)) {
-		if ($obj->client > 0) {
+		if ($companystatic->client > 0) {
 			header("Location: ".DOL_URL_ROOT.'/comm/card.php?socid='.$id);
 			exit;
 		}
@@ -1447,27 +1447,36 @@ $totalarray = array();
 $totalarray['nbfield'] = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
+	$parameters = array('staticdata' => $obj);
+	// Note that $action and $object may have been modified by hook
+	// do companystatic fetch in hook if wanted or anything else
+	$reshook = $hookmanager->executeHooks('loadStaticObject', $parameters, $companystatic, $action);
+	if (empty($reshook)) {
+		$companystatic->id = $obj->rowid;
+		$companystatic->name = $obj->name;
+		$companystatic->name_alias = $obj->name_alias;
+		$companystatic->logo = $obj->logo;
+		$companystatic->barcode = $obj->barcode;
+		$companystatic->canvas = $obj->canvas;
+		$companystatic->client = $obj->client;
+		$companystatic->status = $obj->status;
+		$companystatic->email = $obj->email;
+		$companystatic->address = $obj->address;
+		$companystatic->zip = $obj->zip;
+		$companystatic->town = $obj->town;
+		$companystatic->fournisseur = $obj->fournisseur;
+		$companystatic->code_client = $obj->code_client;
+		$companystatic->code_fournisseur = $obj->code_fournisseur;
+		$companystatic->tva_intra = $obj->tva_intra;
+		$companystatic->country_code = $obj->country_code;
 
-	$companystatic->id = $obj->rowid;
-	$companystatic->name = $obj->name;
-	$companystatic->name_alias = $obj->name_alias;
-	$companystatic->logo = $obj->logo;
-	$companystatic->canvas = $obj->canvas;
-	$companystatic->client = $obj->client;
-	$companystatic->status = $obj->status;
-	$companystatic->email = $obj->email;
-	$companystatic->fournisseur = $obj->fournisseur;
-	$companystatic->code_client = $obj->code_client;
-	$companystatic->code_fournisseur = $obj->code_fournisseur;
-	$companystatic->tva_intra = $obj->tva_intra;
-	$companystatic->country_code = $obj->country_code;
+		$companystatic->code_compta_client = $obj->code_compta;
+		$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-	$companystatic->code_compta_client = $obj->code_compta;
-	$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
-
-	$companystatic->fk_prospectlevel = $obj->fk_prospectlevel;
-	$companystatic->fk_parent = $obj->fk_parent;
-	$companystatic->entity = $obj->entity;
+		$companystatic->fk_prospectlevel = $obj->fk_prospectlevel;
+		$companystatic->fk_parent = $obj->fk_parent;
+		$companystatic->entity = $obj->entity;
+	}
 
 	print '<tr class="oddeven"';
 	if ($contextpage == 'poslist') {
@@ -1501,7 +1510,7 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['s.nom']['checked'])) {
 		print '<td'.(empty($conf->global->MAIN_SOCIETE_SHOW_COMPLETE_NAME) ? ' class="tdoverflowmax200"' : '').' data-key="ref">';
 		if ($contextpage == 'poslist') {
-			print dol_escape_htmltag($obj->name);
+			print dol_escape_htmltag($companystatic->name);
 		} else {
 			print $companystatic->getNomUrl(1, '', 100, 0, 1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
 		}
@@ -1520,56 +1529,56 @@ while ($i < min($num, $limit)) {
 	}
 	// Barcode
 	if (!empty($arrayfields['s.barcode']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->barcode).'">'.dol_escape_htmltag($obj->barcode).'</td>';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companystatic->barcode).'">'.dol_escape_htmltag($companystatic->barcode).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Customer code
 	if (!empty($arrayfields['s.code_client']['checked'])) {
-		print '<td class="nowraponall">'.dol_escape_htmltag($obj->code_client).'</td>';
+		print '<td class="nowraponall">'.dol_escape_htmltag($companystatic->code_client).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Supplier code
 	if (!empty($arrayfields['s.code_fournisseur']['checked'])) {
-		print '<td class="nowraponall">'.dol_escape_htmltag($obj->code_fournisseur).'</td>';
+		print '<td class="nowraponall">'.dol_escape_htmltag($companystatic->code_fournisseur).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Account customer code
 	if (!empty($arrayfields['s.code_compta']['checked'])) {
-		print '<td>'.dol_escape_htmltag($obj->code_compta).'</td>';
+		print '<td>'.dol_escape_htmltag($companystatic->code_compta_client).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Account supplier code
 	if (!empty($arrayfields['s.code_compta_fournisseur']['checked'])) {
-		print '<td>'.dol_escape_htmltag($obj->code_compta_fournisseur).'</td>';
+		print '<td>'.dol_escape_htmltag($companystatic->code_compta_fournisseur).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Address
 	if (!empty($arrayfields['s.address']['checked'])) {
-		print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag($obj->address).'">'.dol_escape_htmltag($obj->address).'</td>';
+		print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag($companystatic->address).'">'.dol_escape_htmltag($companystatic->address).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Zip
 	if (!empty($arrayfields['s.zip']['checked'])) {
-		print "<td>".dol_escape_htmltag($obj->zip)."</td>\n";
+		print "<td>".dol_escape_htmltag($companystatic->zip)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->town).'">'.dol_escape_htmltag($obj->town)."</td>\n";
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companystatic->town).'">'.dol_escape_htmltag($companystatic->town)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1591,7 +1600,7 @@ while ($i < min($num, $limit)) {
 	// Country
 	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print '<td class="center tdoverflowmax100">';
-		$labelcountry = ($obj->country_code && ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code)) ? $langs->trans("Country".$obj->country_code) : $obj->country_label;
+		$labelcountry = ($companystatic->country_code && ($langs->trans("Country".$companystatic->country_code) != "Country".$companystatic->country_code)) ? $langs->trans("Country".$companystatic->country_code) : $obj->country_label;
 		print $labelcountry;
 		print '</td>';
 		if (!$i) {
@@ -1638,13 +1647,13 @@ while ($i < min($num, $limit)) {
 		}
 	}
 	if (!empty($arrayfields['s.phone']['checked'])) {
-		print '<td class="nowraponall">'.dol_print_phone($obj->phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
+		print '<td class="nowraponall">'.dol_print_phone($obj->phone, $companystatic->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
 	if (!empty($arrayfields['s.fax']['checked'])) {
-		print '<td class="nowraponall">'.dol_print_phone($obj->fax, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'fax')."</td>\n";
+		print '<td class="nowraponall">'.dol_print_phone($obj->fax, $companystatic->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'fax')."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1693,11 +1702,11 @@ while ($i < min($num, $limit)) {
 	}
 	// VAT
 	if (!empty($arrayfields['s.tva_intra']['checked'])) {
-		print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($obj->tva_intra).'">';
-		if ($obj->tva_intra && !isValidVATID($companystatic)) {
+		print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($companystatic->tva_intra).'">';
+		if ($companystatic->tva_intra && !isValidVATID($companystatic)) {
 			print img_warning("BadVATNumber", '', 'pictofixedwidth');
 		}
-		print $obj->tva_intra;
+		print $companystatic->tva_intra;
 		print "</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index 726284ede76..66ea5cf46ee 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -694,7 +694,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 	if ($massactionbutton) {
 		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 	}
@@ -703,6 +703,13 @@ if ($resql) {
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre middle">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
 	if (!empty($arrayfields['sp.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
@@ -842,15 +849,20 @@ if ($resql) {
 		print '</td>';
 	}
 	// Action column
-	print '<td class="liste_titre middle">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="liste_titre middle">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 
 	print "</tr>\n";
 
 	// Fields title
 	print '<tr class="liste_titre">';
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	}
 	if (!empty($arrayfields['sp.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['sp.ref']['label'], $_SERVER["PHP_SELF"], 'sp.ref', '', $param, '', $sortfield, $sortorder);
 	}
@@ -923,7 +935,9 @@ if ($resql) {
 	if (!empty($arrayfields['sp.fk_statut']['checked'])) {
 		print_liste_field_titre($arrayfields['sp.fk_statut']['label'], $_SERVER["PHP_SELF"], "sp.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	}
 	print '</tr>'."\n";
 
 	$now = dol_now();
@@ -953,7 +967,18 @@ if ($resql) {
 		$companystatic->code_client = $obj->code_client;
 
 		print '<tr class="oddeven">';
-
+		// Action column
+		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
 		if (!empty($arrayfields['sp.ref']['checked'])) {
 			print '<td class="nowraponall">';
 
@@ -1203,15 +1228,17 @@ if ($resql) {
 		}
 
 		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+			print '<td class="nowrap center">';
+			if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				$selected = 0;
+				if (in_array($obj->rowid, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 95a8e47f009..6f246a0ce96 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -1709,6 +1709,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 
 	select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth200imp, select.minwidth300 {
 		width: calc(100% - 40px) !important;
+		min-width: 100px;
 		display: inline-block;
 	}
 	select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-selection), input.widthcentpercentminusxx {
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 66bda452ccf..8430598a308 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -791,7 +791,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
@@ -802,6 +802,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'fk_statut') {
@@ -903,16 +910,21 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'fk_statut' || $key == 'severity_code') {
@@ -943,7 +955,9 @@ $parameters = array(
 );
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 print '</tr>'."\n";
 
 
@@ -978,6 +992,18 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Show here line of result
 	print '<tr class="oddeven">';
+	// Action column
+	if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+	}
 	foreach ($object->fields as $key => $val) {
 		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
@@ -1118,15 +1144,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($obj->rowid, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 5a5a5d6fc9e..7fc268568c8 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1834,10 +1834,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<tr class="nooddeven"><td>'.$langs->trans("LastConnexion").'</td>';
 			print '<td>';
 			if ($object->datepreviouslogin) {
-				print dol_print_date($object->datepreviouslogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Previous").')</span>, ';
+				print dol_print_date($object->datepreviouslogin, "dayhour", "tzuserrel").' <span class="opacitymedium">('.$langs->trans("Previous").')</span>, ';
 			}
 			if ($object->datelastlogin) {
-				print dol_print_date($object->datelastlogin, "dayhour").' <span class="opacitymedium">('.$langs->trans("Currently").')</span>';
+				print dol_print_date($object->datelastlogin, "dayhour", "tzuserrel").' <span class="opacitymedium">('.$langs->trans("Currently").')</span>';
 			}
 			print '</td>';
 			print "</tr>\n";
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 8f7d152e73a..1ededd091b3 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -331,9 +331,9 @@ if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->ad
 
 print '<td>'.$langs->trans("Permissions").'</td>';
 print '<td class="right nowrap">';
-print '<a class="showallperms" title="'.dol_escape_htmltag($langs->trans("ShowAllPerms")).'" alt="'.dol_escape_htmltag($langs->trans("ShowAllPerms")).'" href="#anchorforperms">'.img_picto('', 'folder-open', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("ExpandAll").'</span></a>';
+print '<a class="showallperms" title="'.dol_escape_htmltag($langs->trans("ShowAllPerms")).'" alt="'.dol_escape_htmltag($langs->trans("ShowAllPerms")).'" href="#">'.img_picto('', 'folder-open', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("ExpandAll").'</span></a>';
 print ' | ';
-print '<a class="hideallperms" title="'.dol_escape_htmltag($langs->trans("HideAllPerms")).'" alt="'.dol_escape_htmltag($langs->trans("HideAllPerms")).'" href="#anchorforperms">'.img_picto('', 'folder', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("UndoExpandAll").'</span></a>';
+print '<a class="hideallperms" title="'.dol_escape_htmltag($langs->trans("HideAllPerms")).'" alt="'.dol_escape_htmltag($langs->trans("HideAllPerms")).'" href="#">'.img_picto('', 'folder', 'class="paddingright"').'<span class="hideonsmartphone">'.$langs->trans("UndoExpandAll").'</span></a>';
 print '</td>';
 
 print '</tr>'."\n";
@@ -469,6 +469,11 @@ if ($result) {
 		}
 		*/
 
+		$isexpanded = ($updatedmodulename == $obj->module || $module == "allmodules");
+		if (!$action) {
+			$isexpanded = 1;	// By default (no action done) we have lines expanded
+		}
+
 		// Break found, it's a new module to catch
 		if (isset($obj->module) && ($oldmod <> $obj->module)) {
 			$oldmod = $obj->module;
@@ -485,24 +490,24 @@ if ($result) {
 			print '</td>';
 			if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) {
 				if ($caneditperms) {
-					print '<td class="center nowrap permtohide_'.$obj->module.'"'.($updatedmodulename != $obj->module && $module != "allmodules" ? ' style="display:none"' : '').'>';
+					print '<td class="center nowrap permtohide_'.$obj->module.'"'.(!$isexpanded ? ' style="display:none"' : '').'>';
 					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&token='.newToken().'&entity='.$entity.'&module='.$obj->module.'&confirm=yes&updatedmodulename='.$obj->module.'">'.$langs->trans("All")."</a>";
 					print ' / ';
 					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delrights&token='.newToken().'&entity='.$entity.'&module='.$obj->module.'&confirm=yes&updatedmodulename='.$obj->module.'">'.$langs->trans("None")."</a>";
 					print '</td>';
-					print '<td class="permtoshow_'.$obj->module.'"'.($updatedmodulename == $obj->module || $module == "allmodules" ? ' style="display:none"' : '').'>&nbsp;</td>';
+					print '<td class="permtoshow_'.$obj->module.'"'.($isexpanded ? ' style="display:none"' : '').'>&nbsp;</td>';
 				} else {
 					print '<td>&nbsp;</td>';
 				}
 				print '<td>&nbsp;</td>';
 			} else {
 				if ($caneditperms) {
-					print '<td class="center wraponsmartphone permtohide_'.$obj->module.'"'.($updatedmodulename != $obj->module && $module != "allmodules" ? ' style="display:none"' : '').'>';
+					print '<td class="center wraponsmartphone permtohide_'.$obj->module.'"'.(!$isexpanded ? ' style="display:none"' : '').'>';
 					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("All")).'" alt="'.dol_escape_htmltag($langs->trans("All")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addrights&token='.newToken().'&entity='.$entity.'&module='.$obj->module.'&confirm=yes&updatedmodulename='.$obj->module.'">'.$langs->trans("All")."</a>";
 					print ' / ';
 					print '<a class="reposition" title="'.dol_escape_htmltag($langs->trans("None")).'" alt="'.dol_escape_htmltag($langs->trans("None")).'" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delrights&token='.newToken().'&entity='.$entity.'&module='.$obj->module.'&confirm=yes&updatedmodulename='.$obj->module.'">'.$langs->trans("None")."</a>";
 					print '</td>';
-					print '<td class="permtoshow_'.$obj->module.'"'.($updatedmodulename == $obj->module || $module == "allmodules" ? ' style="display:none"' : '').'>&nbsp;</td>';
+					print '<td class="permtoshow_'.$obj->module.'"'.($isexpanded ? ' style="display:none"' : '').'>&nbsp;</td>';
 				} else {
 					print '<td class="right"></td>';
 				}
@@ -510,11 +515,11 @@ if ($result) {
 			}
 			print '<td>&nbsp;</td>';
 
-			print '<td class="maxwidthonsmartphone right trforbreakperms" data-hide-perms="'.$obj->module.'" data-hidden-perms="'.($updatedmodulename == $obj->module ? '0' : "1").'">';
-			print '<div class="switchfolderperms folderperms_'.$obj->module.'">';
+			print '<td class="maxwidthonsmartphone right trforbreakperms" data-hide-perms="'.$obj->module.'" data-hidden-perms="'.($isexpanded ? '0' : "1").'">';
+			print '<div class="switchfolderperms folderperms_'.$obj->module.'"'.($isexpanded ? ' style="display:none;"' : '').'>';
 			print img_picto('', 'folder', 'class="marginright"');
 			print '</div>';
-			print '<div class="switchfolderperms folderopenperms_'.$obj->module.'" style="display:none;">';
+			print '<div class="switchfolderperms folderopenperms_'.$obj->module.'"'.(!$isexpanded ? ' style="display:none;"' : '').'>';
 			print img_picto('', 'folder-open', 'class="marginright"');
 			print '</div>';
 			print '</td>'; //Add picto + / - when open en closed
@@ -522,7 +527,7 @@ if ($result) {
 		}
 
 		print '<!-- '.$obj->module.'->'.$obj->perms.($obj->subperms ? '->'.$obj->subperms : '').' -->'."\n";
-		print '<tr class="oddeven trtohide_'.$obj->module.'"'.($updatedmodulename != $obj->module && $module != "allmodules" ? ' style="display:none"' : '').'>';
+		print '<tr class="oddeven trtohide_'.$obj->module.'"'.(!$isexpanded ? ' style="display:none"' : '').'>';
 
 		// Picto and label of module
 		print '<td class="maxwidthonsmartphone tdoverflowonsmartphone">';
@@ -625,6 +630,7 @@ print '</div>';
 
 print '<script>';
 print '$(".trforbreakperms").on("click", function(){
+	console.log("Click on trforbreakperms");
 	moduletohide = $(this).data("hide-perms");
 	if ($(this).data("hidden-perms") == 1){
 		$(".trtohide_"+moduletohide).show();
@@ -646,6 +652,7 @@ print '$(".trforbreakperms").on("click", function(){
 print "\n";
 
 print '$(".showallperms").on("click", function(){
+	console.log("Click on showallperms");
 	$(".trforbreakperms").each( function(){
 		if($(this).data("hidden-perms") != 0){
 			$(this).trigger("click");
@@ -655,6 +662,7 @@ print '$(".showallperms").on("click", function(){
 print "\n";
 
 print '$(".hideallperms").on("click", function(){
+	console.log("Click on hideallperms");
 	$(".trforbreakperms").each( function(){
 		if($(this).data("hidden-perms") != 1){
 			$(this).trigger("click");
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index d532f7f475c..c34d49fc7ca 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -151,10 +151,10 @@ class Website extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param  User $user      	User that creates
+	 * @param  bool $notrigger 	false=launch triggers after, true=disable triggers
 	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @return int 				<0 if KO, 0 if already exists, ID of created object if OK
 	 */
 	public function create(User $user, $notrigger = false)
 	{
@@ -282,8 +282,11 @@ class Website extends CommonObject
 		// Commit or rollback
 		if ($error) {
 			$this->db->rollback();
-
-			return -1 * $error;
+			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				return 0;
+			} else {
+				return -1 * $error;
+			}
 		} else {
 			$this->db->commit();
 
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index a87fce31734..98b5ac49795 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -694,7 +694,10 @@ if ($action == 'addsite' && $usercanedit) {
 		$tmpobject->virtualhost = GETPOST('virtualhost', 'alpha');
 
 		$result = $tmpobject->create($user);
-		if ($result <= 0) {
+		if ($result == 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorLabelAlreadyExists"), null, 'errors');
+		} elseif ($result < 0) {
 			$error++;
 			setEventMessages($tmpobject->error, $tmpobject->errors, 'errors');
 		}
@@ -3678,7 +3681,7 @@ if ($action == 'editcss') {
 	// Manifest.json
 	print '<tr><td class="tdtop">';
 	$htmlhelp = $langs->trans("Example").' :<br>';
-	$htmlhelp .= dol_htmlentitiesbr($manifestjsoncontentdefault);
+	$htmlhelp .= '<small>'.dol_htmlentitiesbr($manifestjsoncontentdefault).'</small>';
 	print $form->textwithpicto($langs->trans('WEBSITE_MANIFEST_JSON'), $htmlhelp, 1, 'help', '', 0, 2, 'manifestjsontooltip');
 	print '</td><td>';
 	print $langs->trans("UseManifest").': '.$form->selectyesno('use_manifest', $website->use_manifest, 1).'<br>';
diff --git a/test/phpunit/Website.class.php b/test/phpunit/Website.class.php
new file mode 100644
index 00000000000..50d0c16453d
--- /dev/null
+++ b/test/phpunit/Website.class.php
@@ -0,0 +1,178 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/WebsiteTest.php
+ *		\ingroup    test
+ *      \brief      PHPUnit test
+ *		\remarks	To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+//require_once 'PHPUnit/Autoload.php';
+
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (! defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1'); // If there is no menu to show
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (! defined("NOLOGIN")) {
+	define("NOLOGIN", '1');       // If this page is public (can be called outside logged session)
+}
+if (! defined("NOSESSION")) {
+	define("NOSESSION", '1');
+}
+
+require_once dirname(__FILE__).'/../../htdocs/main.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/website.lib.php';
+
+
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class WebsiteTest extends PHPUnit\Framework\TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return SecurityTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
+
+
+	/**
+	 * testGetPagesFromSearchCriterias
+	 *
+	 * @return	void
+	 */
+	public function testGetPagesFromSearchCriterias()
+	{
+		global $db;
+
+		$s = "123') OR 1=1-- \' xxx";
+		/*
+		var_dump($s);
+		var_dump($db->escapeforlike($s));
+		var_dump($db->escape($db->escapeforlike($s)));
+		*/
+
+		$res = getPagesFromSearchCriterias('page,blogpost', 'meta,content', $s, 2, 'date_creation', 'DESC', 'en');
+		//var_dump($res);
+		print __METHOD__." message=".$res['code']."\n";
+		// We must found no line (so code should be KO). If we found somethiing, it means there is a SQL injection of the 1=1
+		$this->assertEquals($res['code'], 'KO');
+	}
+}