diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml
index 844b19c7a3f..1682b92a7a7 100644
--- a/.github/workflows/stale-issues-safe.yml
+++ b/.github/workflows/stale-issues-safe.yml
@@ -16,7 +16,7 @@ jobs:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-message: 'This issue is stale because it has been open 1 year with no activity. If this is a bug, please comment to confirm it is still present on latest stable version. if this is a feature request, please comment to notify the request is still relevant and not yet covered by latest stable version. This issue may be closed automatically by stale bot in 10 days (you should still be able to re-open it if required).'
         stale-label: 'Issue Stale (automatic label)'
-        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE),Analysis of PR in progres'
+        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,hacktoberfest,hacktoberfest-accepted,good first issue,Bug Security (CVE),Analysis of PR in progress'
         days-before-stale: 365
         days-before-close: 10
         operations-per-run: 100
diff --git a/.gitignore b/.gitignore
index 344822f0e9e..b49fdf8dc86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,16 @@ htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
+
+# Node Modules
+build/yarn-error.log
+build/node_modules/
+node_modules/
+
+#yarn
+yarn.lock
+
+#package-lock
+package-lock.json
+
+doc/install.lock
diff --git a/.travis.yml b/.travis.yml
index c47e1b19598..16d3403f554 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,8 @@
 os: linux
 dist: xenial
 #dist: bionic
-sudo: required
+# Deprecated: The key sudo has no effect anymore.
+#sudo: required
 
 language: php
 
diff --git a/.tx/config b/.tx/config
index 696ff858394..b98bf7828f2 100644
--- a/.tx/config
+++ b/.tx/config
@@ -164,6 +164,12 @@ source_file = htdocs/langs/en_US/hrm.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
+[dolibarr.intracommreport]
+file_filter = htdocs/langs/<lang>/intracommreport.lang
+source_file = htdocs/langs/en_US/intracommreport.lang
+source_lang = en_US
+type = MOZILLAPROPERTIES
+
 [dolibarr.install]
 file_filter = htdocs/langs/<lang>/install.lang
 source_file = htdocs/langs/en_US/install.lang
diff --git a/ChangeLog b/ChangeLog
index ca5834f63f2..27d9129c762 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,8 @@ NEW: Module Reception (for a more accurate management of your receptions) moved
 WARNING:
 
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
-* Properties ->contactid has been renamed into ->contact_id
+* Properties ->contactid have been renamed into ->contact_id
+* Properties ->titre have been renamed into ->title 
 * Property $paiementid in API 'api_supplier_invoices.php' has been renamed into into $payment_mode_id (english)
 * The deprecated subsitution key __SIGNATURE__ has been removed. Replace with __USER_SIGNATURE__ if you used the old syntax in
   your email templates. 
@@ -24,6 +25,9 @@ Following changes may create regressions for some external modules, but were nec
 * The GETPOST(..., 'alpha') has now the same behaviour than GETPOST(..., 'alphanohtml') so no html will be allowed. Use GETPOST(..., 'restricthtml') to accept HTML.
 * If you have links in your code with '&action=delete' as a parameter, you must also add '&token='.newToken() as another parameter to avoid CSRF protection errors.
 * The API addPayment for api_invoice has evolved to accept amount into a foreign currency. You must provide array(amount=>X,mutlicurrency_ammount=>Y) instead of amount.
+* The method select_thirdparty(), deprecated since 3.8, into html.form.class.php has been removed.
+* Depreciate all methods with name valide(). Use instead methods validate().
+
 
 ***** ChangeLog for 12.0.3 compared to 12.0.2 *****
 FIX: 10.0 - when the mime file name is different from the filesystem name, the attachment name should be the mime filename
diff --git a/README.md b/README.md
index 648d5ef003d..919fc62ae5b 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 ![Downloads per day](https://img.shields.io/sourceforge/dw/dolibarr.svg)
 ![Build status](https://img.shields.io/travis/Dolibarr/dolibarr/develop.svg)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg?style=flat-square)](https://php.net/)
+[![GitHub release](https://img.shields.io/github/v/release/Dolibarr/dolibarr)](https://github.com/Dolibarr/dolibarr)
 
 Dolibarr ERP & CRM is a modern software package that helps manage your organization's activity (contacts, suppliers, invoices, orders, stocks, agenda…).
 
diff --git a/build/docker/docker-compose.yml b/build/docker/docker-compose.yml
index efdc95d2858..7e4ceda902e 100644
--- a/build/docker/docker-compose.yml
+++ b/build/docker/docker-compose.yml
@@ -12,8 +12,11 @@ services:
         environment:
             MYSQL_ROOT_PASSWORD: root
             MYSQL_DATABASE: dolibarr
+        ports:
+            - "3306:3306"
         networks:
             - internal-pod
+            - external-pod
 
     phpmyadmin:
         image: phpmyadmin/phpmyadmin
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 24b32dcff91..85212d9c5ba 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -620,6 +620,9 @@ if ($nboftargetok) {
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/fonts/utils`;
         $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/tools`;
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/tecnickcom/tcpdf/LICENSE.TXT`;
+
+        $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/includes/autoload.php`;
+
         $ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
 	}
 
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 343cebc6abe..8b6a9888db0 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -1,7 +1,7 @@
 #----------------------------------------------------------------------------
 # \file         dolibarr.pl
 # \brief        Dolibarr script install for Virtualmin Pro
-# \author       (c)2009-2019 Regis Houssin  <regis.houssin@inodbox.com>
+# \author       (c)2009-2020 Regis Houssin  <regis.houssin@inodbox.com>
 #----------------------------------------------------------------------------
 
 
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "10.0.0", "9.0.3", "8.0.5", "7.0.5", "6.0.8" );
+return ( "12.0.3", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
 }
 
 sub script_dolibarr_release
@@ -77,6 +77,16 @@ if ($ver >= 3.6) {
 		push(@rv, "Dolibarr requires PHP version 5.3 or later");
 		}
 	}
+if ($ver >= 12.0) {
+	# Check for PHP 5.6+
+	local $phpv = &get_php_version($phpver || 5, $d);
+	if (!$phpv) {
+		push(@rv, "Could not work out exact PHP version");
+		}
+	elsif ($phpv < 5.6) {
+		push(@rv, "Dolibarr requires PHP version 5.6 or later");
+		}
+	}
 
 return @rv;
 }
@@ -376,7 +386,7 @@ sub script_dolibarr_realversion
 local ($d, $opts, $sinfo) = @_;
 local $lref = &read_file_lines("$opts->{'dir'}/filefunc.inc.php", 1);
 foreach my $l (@$lref) {
-		if ($l =~ /'DOL_VERSION','([0-9a-z\.\-]+)'/) {
+		if ($l =~ /'DOL_VERSION',\s?'([0-9a-z\.\-]+)'/) {
                 return $1;
                 }
         }
@@ -390,6 +400,8 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
+				$ver >= 12.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
+				$ver >= 11.0 ? "dolibarr\\-(11\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 10.0 ? "dolibarr\\-(10\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 9.0 ? "dolibarr\\-(9\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 8.0 ? "dolibarr\\-(8\\.0\\.[0-9\\.]+)\\.tgz" :
@@ -410,7 +422,7 @@ return $ver eq $vers[0] ? undef : $vers[0];
 
 sub script_dolibarr_site
 {
-return 'http://www.dolibarr.org/';
+return 'https://www.dolibarr.org/';
 }
 
 sub script_dolibarr_passmode
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index 115edcef397..039dafd198f 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -196,6 +196,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index 64293ff6580..098a041680a 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -276,6 +276,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 28b58a4da96..a3f2d1d8d96 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -193,6 +193,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index 8b4ccf37808..5b1b86b28f4 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -204,6 +204,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/imports
 %_datadir/dolibarr/htdocs/includes
 %_datadir/dolibarr/htdocs/install
+%_datadir/dolibarr/htdocs/intracommreport
 %_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
 %_datadir/dolibarr/htdocs/livraison
 %_datadir/dolibarr/htdocs/loan
diff --git a/dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf b/dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf
new file mode 100644
index 00000000000..fef9f48f53e
Binary files /dev/null and b/dev/resources/iso-normes/Intracommreport-ManuelDebXml.pdf differ
diff --git a/dev/resources/iso-normes/Intracommreport-ManuelDesXML.pdf b/dev/resources/iso-normes/Intracommreport-ManuelDesXML.pdf
new file mode 100644
index 00000000000..b1074b3b8a3
Binary files /dev/null and b/dev/resources/iso-normes/Intracommreport-ManuelDesXML.pdf differ
diff --git a/dev/tools/dolibarr-postgres2mysql.php b/dev/tools/dolibarr-postgres2mysql.php
index c17a73dfe12..fd30540c019 100644
--- a/dev/tools/dolibarr-postgres2mysql.php
+++ b/dev/tools/dolibarr-postgres2mysql.php
@@ -357,8 +357,8 @@ function pg2mysql(&$input, &$arrayofprimaryalreadyintabledef, $header = true)
 			$line = str_replace(" time with time zone", " time", $line);
 			$line = str_replace(" time without time zone", " time", $line);
 
-			$line = str_replace(" timestamp DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP", $line);
-			$line = str_replace(" timestamp without time zone DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP", $line);
+			$line = str_replace(" timestamp DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP", $line);
+			$line = str_replace(" timestamp without time zone DEFAULT now()", " timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP", $line);
 
 			if (strstr($line, "auto_increment") || preg_match('/ rowid int/', $line) || preg_match('/ id int/', $line)) {
 				$field = getfieldname($line);
diff --git a/doc/images/invoice.png b/doc/images/invoice.png
new file mode 100644
index 00000000000..9be03a52ed8
Binary files /dev/null and b/doc/images/invoice.png differ
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 0ac79bcc3aa..88282447c51 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -294,13 +294,11 @@ if ($resql)
 	print '<input type="hidden" name="action" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
     $newcardbutton .= dolGetButtonTitle($langs->trans("New"), $langs->trans("Addanaccount"), 'fa fa-plus-circle', './card.php?action=create');
 
-
-    print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+    print_barre_liste($langs->trans('ListAccounts'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	// Box to select active chart of account
     print $langs->trans("Selectchartofaccounts")." : ";
@@ -343,15 +341,15 @@ if ($resql)
 
 	// Line for search fields
 	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_account" value="'.$search_account.'"></td>';
-	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_label" value="'.$search_label.'"></td>';
-	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat" size="20" name="search_labelshort" value="'.$search_labelshort.'"></td>';
+	if (!empty($arrayfields['aa.account_number']['checked']))	print '<td class="liste_titre"><input type="text" class="flat width100" name="search_account" value="'.$search_account.'"></td>';
+	if (!empty($arrayfields['aa.label']['checked']))			print '<td class="liste_titre"><input type="text" class="flat width150" name="search_label" value="'.$search_label.'"></td>';
+	if (!empty($arrayfields['aa.labelshort']['checked']))		print '<td class="liste_titre"><input type="text" class="flat width100" name="search_labelshort" value="'.$search_labelshort.'"></td>';
 	if (!empty($arrayfields['aa.account_parent']['checked'])) {
 		print '<td class="liste_titre">';
 		print $formaccounting->select_account($search_accountparent, 'search_accountparent', 2);
 		print '</td>';
 	}
-	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
+	if (!empty($arrayfields['aa.pcg_type']['checked']))		    print '<td class="liste_titre"><input type="text" class="flat width100" name="search_pcgtype" value="'.$search_pcgtype.'"></td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) { if (!empty($arrayfields['aa.reconcilable']['checked']))   print '<td class="liste_titre">&nbsp;</td>'; }
 	if (!empty($arrayfields['aa.active']['checked']))			print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
@@ -416,18 +414,24 @@ if ($resql)
 		// Account parent
 		if (!empty($arrayfields['aa.account_parent']['checked']))
 		{
-			if (!empty($obj->account_parent))
+			// Note: obj->account_parent is a foreign key to a rowid. It is field in child table and obj->rowid2 is same, but in parent table.
+			// So for orphans, obj->account_parent is set but not obj->rowid2
+			if (!empty($obj->account_parent) && !empty($obj->rowid2))
 			{
+				print "<td>";
+				print '<!-- obj->account_parent = '.$obj->account_parent.' obj->rowid2 = '.$obj->rowid2.' -->';
 				$accountparent->id = $obj->rowid2;
 				$accountparent->label = $obj->label2;
-				$accountparent->account_number = $obj->account_number2;
-
-				print "<td>";
+				$accountparent->account_number = $obj->account_number2;	// Sotre an account number for output
 				print $accountparent->getNomUrl(1);
 				print "</td>\n";
 				if (!$i) $totalarray['nbfield']++;
 			} else {
-				print '<td>&nbsp;</td>';
+				print '<td>';
+				if (!empty($obj->account_parent)) {
+					print '<!-- Bad value for obj->account_parent = '.$obj->account_parent.': is a rowid that does not exists -->';
+				}
+				print '</td>';
 				if (!$i) $totalarray['nbfield']++;
 			}
 		}
@@ -481,11 +485,11 @@ if ($resql)
 		// Action
 		print '<td class="center">';
 		if ($user->rights->accounting->chartofaccount) {
-			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">';
+			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_edit();
 			print '</a>';
 			print '&nbsp;';
-			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?chartofaccounts='.$object->id).'">';
+			print '<a class="marginleftonly" href="./card.php?action=delete&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_delete();
 			print '</a>';
 		}
diff --git a/htdocs/accountancy/admin/categories.php b/htdocs/accountancy/admin/categories.php
index d605105f8e9..f68fbc18905 100644
--- a/htdocs/accountancy/admin/categories.php
+++ b/htdocs/accountancy/admin/categories.php
@@ -172,7 +172,7 @@ if ($action == 'display' || $action == 'delete') {
 				print '<td class="right">';
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&account_category='.$cat_id.'&cptid='.$cpt->rowid.'">';
 				print $langs->trans("DeleteFromCat");
-				print img_picto($langs->trans("DeleteFromCat"), 'unlink');
+				print img_picto($langs->trans("DeleteFromCat"), 'unlink', 'class="paddingleft"');
 				print "</a>";
 				print "</td>";
 				print "</tr>\n";
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index 3d03dc9c4b6..b9377ce4431 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -47,9 +47,9 @@ $action = GETPOST('action', 'aZ09');
 
 
 $list_account_main = array(
-    'ACCOUNTING_ACCOUNT_CUSTOMER',
-    'ACCOUNTING_ACCOUNT_SUPPLIER',
-    'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
+	'ACCOUNTING_ACCOUNT_CUSTOMER',
+	'ACCOUNTING_ACCOUNT_SUPPLIER',
+	'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',
 );
 
 $list_account = array();
@@ -120,9 +120,9 @@ if ($action == 'update') {
 
 		$constvalue = GETPOST($constname, 'alpha');
 
-	    if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
-	        $error++;
-	    }
+		if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+			$error++;
+		}
 	}
 
 	if (!$error) {
@@ -159,20 +159,20 @@ print '<table class="noborder centpercent">';
 print '<tr class="liste_titre"><td>'.$langs->trans("ThirdParties").' | '.$langs->trans("Users").'</td><td></td></tr>';
 
 foreach ($list_account_main as $key) {
-    print '<tr class="oddeven value">';
-    // Param
-    $label = $langs->trans($key);
-    $keydesc = $key.'_Desc';
+	print '<tr class="oddeven value">';
+	// Param
+	$label = $langs->trans($key);
+	$keydesc = $key.'_Desc';
 
-    $htmltext = $langs->trans($keydesc);
-    print '<td class="fieldrequired" width="50%">';
-    print $form->textwithpicto($label, $htmltext);
-    print '</td>';
-    // Value
-    print '<td>'; // Do not force class=right, or it align also the content of the select box
-    print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
-    print '</td>';
-    print '</tr>';
+	$htmltext = $langs->trans($keydesc);
+	print '<td class="fieldrequired" width="50%">';
+	print $form->textwithpicto($label, $htmltext);
+	print '</td>';
+	// Value
+	print '<td>'; // Do not force class=right, or it align also the content of the select box
+	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1);
+	print '</td>';
+	print '</tr>';
 }
 
 
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index a122d3acab5..a4227a761a4 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -300,16 +300,16 @@ if ($action == 'create')
 
 			if (!empty($user->rights->accounting->fiscalyear->write))
 			{
-    			/*
+				/*
     			 * Barre d'actions
     			 */
-    			print '<div class="tabsAction">';
+				print '<div class="tabsAction">';
 
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
 
-    			// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&token='.newToken().'&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
+				// print '<a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&token='.newToken().'&id=' . $id . '">' . $langs->trans('Delete') . '</a>';
 
-    			print '</div>';
+				print '</div>';
 			}
 		}
 	} else {
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index e48ee43ef8d..819160e7d23 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -22,7 +22,7 @@
  * \brief		Setup page to configure journals
  */
 
-if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
diff --git a/htdocs/accountancy/admin/subaccount.php b/htdocs/accountancy/admin/subaccount.php
index 67175261f02..4b44bd35149 100644
--- a/htdocs/accountancy/admin/subaccount.php
+++ b/htdocs/accountancy/admin/subaccount.php
@@ -20,7 +20,7 @@
 /**
  * \file 		htdocs/accountancy/admin/subaccount.php
  * \ingroup     Accountancy (Double entries)
- * \brief		List accounting sub-account
+ * \brief		List of accounting sub-account (auxiliary accounts)
  */
 
 require '../../main.inc.php';
@@ -59,10 +59,10 @@ if (!$sortfield) $sortfield = "label";
 if (!$sortorder) $sortorder = "ASC";
 
 $arrayfields = array(
-    'subaccount'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
-    'label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-    'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1)
+	'subaccount'=>array('label'=>$langs->trans("AccountNumber"), 'checked'=>1),
+	'label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'reconcilable'=>array('label'=>$langs->trans("Reconcilable"), 'checked'=>1)
 );
 
 if ($conf->global->MAIN_FEATURES_LEVEL < 2) unset($arrayfields['reconcilable']);
@@ -80,17 +80,17 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (!empty($cancel)) $action = '';
+	if (!empty($cancel)) $action = '';
 
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-    {
-    	$search_subaccount = "";
-    	$search_label = "";
-    	$search_type = "";
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
+	{
+		$search_subaccount = "";
+		$search_label = "";
+		$search_type = "";
 		$search_array_options = array();
-    }
+	}
 }
 
 
@@ -100,13 +100,15 @@ if (empty($reshook))
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans("ReportThirdParty"));
+$title = $langs->trans('ChartOfIndividualAccountsOfSubsidiaryLedger');
+
+llxHeader('', $title);
 
 // Customer
 $sql = "SELECT sa.rowid, sa.nom as label, sa.code_compta as subaccount, '0' as type, sa.entity";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe sa";
-$sql .= ' WHERE sa.entity IN ('.getEntity('societe').')';
-$sql .= ' AND sa.code_compta <> ""';
+$sql .= " WHERE sa.entity IN (".getEntity('societe').")";
+$sql .= " AND sa.code_compta <> ''";
 //print $sql;
 if (strlen(trim($search_subaccount))) {
 	$lengthpaddingaccount = 0;
@@ -142,13 +144,13 @@ if (strlen(trim($search_subaccount))) {
 	}
 }
 if (strlen(trim($search_label)))				$sql .= natural_search("sa.nom", $search_label);
-if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$search_type."'";
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
 
 // Supplier
 $sql .= " UNION ";
 $sql .= " SELECT sa.rowid, sa.nom as label, sa.code_compta_fournisseur as subaccount, '1' as type, sa.entity FROM ".MAIN_DB_PREFIX."societe sa";
-$sql .= ' WHERE sa.entity IN ('.getEntity('societe').')';
-$sql .= ' AND sa.code_compta_fournisseur <> ""';
+$sql .= " WHERE sa.entity IN (".getEntity('societe').")";
+$sql .= " AND sa.code_compta_fournisseur <> ''";
 //print $sql;
 if (strlen(trim($search_subaccount))) {
 	$lengthpaddingaccount = 0;
@@ -184,13 +186,13 @@ if (strlen(trim($search_subaccount))) {
 	}
 }
 if (strlen(trim($search_label)))				$sql .= natural_search("sa.nom", $search_label);
-if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$search_type."'";
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
 
 // User
 $sql .= " UNION ";
 $sql .= " SELECT u.rowid, u.lastname as label, u.accountancy_code as subaccount, '2' as type, u.entity FROM ".MAIN_DB_PREFIX."user u";
-$sql .= ' WHERE u.entity IN ('.getEntity('user').')';
-$sql .= ' AND u.accountancy_code <> ""';
+$sql .= " WHERE u.entity IN (".getEntity('user').")";
+$sql .= " AND u.accountancy_code <> ''";
 //print $sql;
 if (strlen(trim($search_subaccount))) {
 	$lengthpaddingaccount = 0;
@@ -226,7 +228,7 @@ if (strlen(trim($search_subaccount))) {
 	}
 }
 if (strlen(trim($search_label)))				$sql .= natural_search("u.lastname", $search_label);
-if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$search_type."'";
+if (!empty($search_type) && $search_type >= 0)	$sql .= " HAVING type LIKE '".$db->escape($search_type)."'";
 
 $sql .= $db->order($sortfield, $sortorder);
 
@@ -268,18 +270,18 @@ if ($resql)
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-	print_barre_liste($langs->trans('ReportThirdParty'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit, 0, 0, 1);
 
 	print '<div class="warning">'.$langs->trans("WarningCreateSubAccounts").'</div>';
 
 	$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); // This also change content of $arrayfields
 
-    $moreforfilter = '';
-    $massactionbutton = '';
+	$moreforfilter = '';
+	$massactionbutton = '';
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Line for search fields
 	print '<tr class="liste_titre_filter">';
@@ -293,7 +295,7 @@ if ($resql)
 	print '</td>';
 	print '</tr>';
 
-    print '<tr class="liste_titre">';
+	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['subaccount']['checked']))	print_liste_field_titre($arrayfields['subaccount']['label'], $_SERVER["PHP_SELF"], "subaccount", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['label']['checked']))		print_liste_field_titre($arrayfields['label']['label'], $_SERVER["PHP_SELF"], "label", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['type']['checked']))		print_liste_field_titre($arrayfields['type']['label'], $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -335,17 +337,17 @@ if ($resql)
 			// Customer
 			if ($obj->type == 0)
 			{
-				$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->rowid.'">'.$langs->trans("Customer").'</a>';
+				$s .= '<a class="customer-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->rowid.'">'.$langs->trans("Customer").'</a>';
 			}
 			// Supplier
 			elseif ($obj->type == 1)
 			{
-				$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->rowid.'">'.$langs->trans("Supplier").'</a>';
+				$s .= '<a class="vendor-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->rowid.'">'.$langs->trans("Supplier").'</a>';
 			}
 			// User
 			elseif ($obj->type == 2)
 			{
-				$s .= '<a class="user-back" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->id.'">'.$langs->trans("Employee").'</a>';
+				$s .= '<a class="user-back" style="padding-left: 6px; padding-right: 6px" title="'.$langs->trans("Employee").'" href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->id.'">'.$langs->trans("Employee").'</a>';
 			}
 			print $s;
 			print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 3608622916d..c3e225e5399 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -339,7 +339,7 @@ if ($action != 'export_csv')
 		print '<td class="nowraponall right">'.price($opening_balances["'".$line->numero_compte."'"]).'</td>';
 		print '<td class="nowraponall right">'.price($line->debit).'</td>';
 		print '<td class="nowraponall right">'.price($line->credit).'</td>';
-		print '<td class="nowraponall right">'.price($line->debit - $line->credit).'</td>';
+		print '<td class="nowraponall right">'.price(price2num($line->debit - $line->credit, 'MT')).'</td>';
 		print '<td class="center">'.$link;
 		print '</td>';
 		print "</tr>\n";
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index ef105b6709a..8ca880de25f 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -328,7 +328,7 @@ llxHeader('', $langs->trans("CreateMvts"));
 
 // Confirmation to delete the command
 if ($action == 'delete') {
-	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'confirm_delete', '', 0, 1);
+	$formconfirm = $html->formconfirm($_SERVER["PHP_SELF"].'?id='.$id.'&mode='.$mode, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'confirm_delete', '', 0, 1);
 	print $formconfirm;
 }
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index 813dbd4a37f..d89d0dca60c 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -108,7 +108,7 @@ $hookmanager->initHooks(array('bookkeepinglist'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !isset($_POST['begin']) && !isset($_GET['begin']) && !isset($_POST['formfilteraction']) && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export)
+if (!in_array($action, array('export_file', 'delmouv', 'delmouvconfirm')) && !GETPOSTISSET('begin') && !isset($_POST['formfilteraction']) && GETPOST('page', 'int') == '' && !GETPOST('noreset', 'int') && $user->rights->accounting->mouvements->export)
 {
 	if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('restore_lastsearch_values'))
 	{
@@ -529,7 +529,7 @@ if ($action == 'export_file' && $user->rights->accounting->mouvements->export) {
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
 
-$title_page = $langs->trans("Bookkeeping");
+$title_page = $langs->trans("Operations").' - '.$langs->trans("Journals");
 
 // Count total nb of records
 $nbtotalofrecords = '';
@@ -608,22 +608,21 @@ if ($action == 'delbookkeepingyear') {
 			'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
 	print $formconfirm;
 }
 
 //$param='';	param started before
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.urlencode($optioncss).'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="sortfield" value="'.urlencode($sortfield).'">';
+print '<input type="hidden" name="sortorder" value="'.urlencode($sortorder).'">';
 
 if (count($filter)) $buttonLabel = $langs->trans("ExportFilteredList");
 else $buttonLabel = $langs->trans("ExportList");
@@ -638,13 +637,14 @@ $newcardbutton .= '<span class="valignmiddle marginrightonly">'.$langs->trans("I
 
 $newcardbutton .= dolGetButtonTitle($buttonLabel, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', 'fa fa-file-export paddingleft', $_SERVER["PHP_SELF"].'?action=export_file'.($param ? '&'.$param : ''), $user->rights->accounting->mouvements->export);
 
-$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param);
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss'=>'marginleftonly btnTitleSelected'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss'=>'marginleftonly'));
 
 $url = './card.php?action=create';
 if (!empty($socid)) $url .= '&socid='.$socid;
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', $url, '', $user->rights->accounting->mouvements->creer);
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -670,12 +670,10 @@ if (!empty($arrayfields['t.doc_date']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1);
+	print $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1);
+	print $form->selectDate($search_date_end ? $search_date_end : -1, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -703,25 +701,25 @@ if (!empty($arrayfields['t.subledger_account']['checked']))
 {
 	print '<td class="liste_titre">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
+		print $langs->trans('From').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_start, 'search_accountancy_aux_code_start', 1);
 	} else {
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'">';
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_start" value="'.$search_accountancy_aux_code_start.'" placeholder="'.$langs->trans("From").'">';
 	}
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
 	// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because it does not
 	// use setup of keypress to select thirdparty and this hang browser on large database.
 	if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX))
 	{
+		print $langs->trans('to').' ';
 		print $formaccounting->select_auxaccount($search_accountancy_aux_code_end, 'search_accountancy_aux_code_end', 1);
 	} else {
-		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'">';
+		print '<input type="text" class="maxwidth100" name="search_accountancy_aux_code_end" value="'.$search_accountancy_aux_code_end.'" placeholder="'.$langs->trans("to").'">';
 	}
 	print '</div>';
 	print '</td>';
@@ -771,12 +769,10 @@ if (!empty($arrayfields['t.date_creation']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_creation_start, 'date_creation_start', 0, 0, 1);
+	print $form->selectDate($search_date_creation_start, 'date_creation_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_creation_end, 'date_creation_end', 0, 0, 1);
+	print $form->selectDate($search_date_creation_end, 'date_creation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -785,12 +781,10 @@ if (!empty($arrayfields['t.tms']['checked']))
 {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From').' ';
-	print $form->selectDate($search_date_modification_start, 'date_modification_start', 0, 0, 1);
+	print $form->selectDate($search_date_modification_start, 'date_modification_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to').' ';
-	print $form->selectDate($search_date_modification_end, 'date_modification_end', 0, 0, 1);
+	print $form->selectDate($search_date_modification_end, 'date_modification_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '</td>';
 }
@@ -799,12 +793,10 @@ if (!empty($arrayfields['t.date_export']['checked']))
 {
     print '<td class="liste_titre center">';
     print '<div class="nowrap">';
-    print $langs->trans('From').' ';
-    print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1);
+    print $form->selectDate($search_date_export_start, 'date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
     print '</div>';
     print '<div class="nowrap">';
-    print $langs->trans('to').' ';
-    print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1);
+    print $form->selectDate($search_date_export_end, 'date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
     print '</div>';
     print '</td>';
 }
@@ -1049,10 +1041,10 @@ while ($i < min($num, $limit))
 	print '<td class="nowraponall center">';
 	if (empty($line->date_export)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda paddingleft marginrightonly" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
 		}
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
 	}
 	print '</td>';
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index e0e16e00d12..4ed055be0b1 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -33,7 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
@@ -55,6 +54,7 @@ if ($search_accountancy_code_end == - 1) {
 }
 $search_doc_ref = GETPOST('search_doc_ref', 'alpha');
 $search_label_operation = GETPOST('search_label_operation', 'alpha');
+$search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_direction = GETPOST('search_direction', 'alpha');
 $search_ledger_code = GETPOST('search_ledger_code', 'alpha');
 $search_debit = GETPOST('search_debit', 'alpha');
@@ -86,7 +86,7 @@ $hookmanager->initHooks(array('bookkeepingbyaccountlist'));
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
 
-if (empty($search_date_start) && empty($search_date_end) && GETPOSTISSET('search_date_startday') && GETPOSTISSET('search_date_startmonth') && GETPOSTISSET('search_date_starthour')) {
+if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('search_date_startday') && !GETPOSTISSET('search_date_startmonth') && !GETPOSTISSET('search_date_starthour')) {
 	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
 	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
 	$sql .= $db->plimit(1);
@@ -149,6 +149,7 @@ if (empty($reshook))
 		$search_label_account = '';
 		$search_doc_ref = '';
 		$search_label_operation = '';
+		$search_mvt_num = '';
 		$search_direction = '';
 		$search_ledger_code = '';
 		$search_date_start = '';
@@ -193,6 +194,10 @@ if (empty($reshook))
 		$filter['t.label_compte'] = $search_label_account;
 		$param .= '&search_label_compte=' . urlencode($search_label_account);
 	}
+	if (!empty($search_mvt_num)) {
+		$filter['t.piece_num'] = $search_mvt_num;
+		$param .= '&search_mvt_num=' . urlencode($search_mvt_num);
+	}
 	if (!empty($search_doc_ref)) {
 		$filter['t.doc_ref'] = $search_doc_ref;
 		$param .= '&search_doc_ref=' . urlencode($search_doc_ref);
@@ -294,7 +299,7 @@ $formfile = new FormFile($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
-$title_page = $langs->trans("Bookkeeping").' '.strtolower($langs->trans("By")).' '.strtolower($langs->trans("AccountAccounting"));
+$title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccounting").' ('.$langs->trans("Bookkeeping").')';
 
 llxHeader('', $title_page);
 
@@ -358,7 +363,7 @@ if ($action == 'delbookkeepingyear') {
 		'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
 	print $formconfirm;
 }
 
@@ -370,16 +375,19 @@ if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$opt
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="page" value="'.$page.'">';
 
 
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
+$newcardbutton .= dolGetButtonTitle($langs->trans('VueByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss'=>'marginleftonly btnTitleSelected'));
+
+$newcardbutton .= ' &nbsp; ';
+
 $newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', './card.php?action=create');
 
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
 if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $viewflat.$newcardbutton, '', $limit, 0, 0, 1);
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -394,10 +402,10 @@ $moreforfilter = '';
 // Accountancy account
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('AccountAccounting').': ';
-$moreforfilter .= '<div class="nowrap">';
+$moreforfilter .= '<div class="nowrap inline-block">';
 $moreforfilter .= $langs->trans('From').' ';
 $moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', 1, array(), 1, 1, 'maxwidth200');
-$moreforfilter .= $langs->trans('to').' ';
+$moreforfilter .= ' '.$langs->trans('to').' ';
 $moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', 1, array(), 1, 1, 'maxwidth200');
 $moreforfilter .= '</div>';
 $moreforfilter .= '</div>';
@@ -425,12 +433,10 @@ if (!empty($arrayfields['t.code_journal']['checked'])) {
 if (!empty($arrayfields['t.doc_date']['checked'])) {
 	print '<td class="liste_titre center">';
 	print '<div class="nowrap">';
-	print $langs->trans('From') . ': ';
-	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1);
+	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
 	print '</div>';
 	print '<div class="nowrap">';
-	print $langs->trans('to') . ': ';
-	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1);
+	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '</td>';
 }
@@ -697,10 +703,10 @@ while ($i < min($num, $limit))
 	print '<td class="nowraponall center">';
 	if (empty($line->date_export)) {
 		if ($user->rights->accounting->mouvements->creer) {
-			print '<a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_edit().'</a>';
 		}
 		if ($user->rights->accounting->mouvements->supprimer) {
-			print '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+			print ' &nbsp; <a class="paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
 		}
 	}
 	print '</td>';
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index 24f14d2ebd2..199899f89d5 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -448,7 +448,7 @@ class AccountingAccount extends CommonObject
 	 * @param	int  	$notooltip					1=Disable tooltip
      * @param	int     $save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 * @param	int     $withcompletelabel		    0=Short label (field short label), 1=Complete label (field label)
-	 * @param	string	$option						'bookkeeping', 'bookkeepinglistbyaccount', 'accountcard'
+	 * @param	string	$option						'ledger', 'journals', 'accountcard'
 	 * @return  string	String with URL
 	 */
     public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
@@ -460,12 +460,12 @@ class AccountingAccount extends CommonObject
 
 		$result = '';
 
-		if (empty($option) || $option == 'bookkeeping') {
-			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
-			$labelurl = $langs->trans("ShowAccountingAccountInBookKeeping");
-		} elseif ($option == 'bookkeepinglistbyaccount') {
+		if (empty($option) || $option == 'ledger') {
 			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
-			$labelurl = $langs->trans("ShowAccountingAccountInBookKeepingByAccount");
+			$labelurl = $langs->trans("ShowAccountingAccountInLedger");
+		} elseif ($option == 'journals') {
+			$url = DOL_URL_ROOT . '/accountancy/bookkeeping/list.php?search_accountancy_code_start=' . $this->account_number . '&search_accountancy_code_end=' . $this->account_number;
+			$labelurl = $langs->trans("ShowAccountingAccountInJournals");
 		} elseif ($option == 'accountcard') {
 			$url = DOL_URL_ROOT . '/accountancy/admin/card.php?id=' . $this->id;
 			$labelurl = $langs->trans("ShowAccountingAccount");
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index 790aba68203..f5f4bf80221 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -57,80 +57,80 @@ class BookKeeping extends CommonObject
 	 */
 	public $id;
 
-    /**
-     * @var string Date of source document, in db date NOT NULL
-     */
+	/**
+	 * @var string Date of source document, in db date NOT NULL
+	 */
 	public $doc_date;
 
-    /**
-     * @var int Deadline for payment
-     */
+	/**
+	 * @var int Deadline for payment
+	 */
 	public $date_lim_reglement;
 
-    /**
-     * @var string doc_type
-     */
-    public $doc_type;
+	/**
+	 * @var string doc_type
+	 */
+	public $doc_type;
 
-    /**
-     * @var string doc_ref
-     */
+	/**
+	 * @var string doc_ref
+	 */
 	public $doc_ref;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_doc;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_docdet;
 
-    /**
-     * @var string thirdparty code
-     */
-    public $thirdparty_code;
+	/**
+	 * @var string thirdparty code
+	 */
+	public $thirdparty_code;
 
-    /**
-     * @var string subledger account
-     */
+	/**
+	 * @var string subledger account
+	 */
 	public $subledger_account;
 
-    /**
-     * @var string subledger label
-     */
+	/**
+	 * @var string subledger label
+	 */
 	public $subledger_label;
 
-    /**
-     * @var string  doc_type
-     */
+	/**
+	 * @var string  doc_type
+	 */
 	public $numero_compte;
 
-    /**
-     * @var string label compte
-     */
-    public $label_compte;
+	/**
+	 * @var string label compte
+	 */
+	public $label_compte;
 
-    /**
-     * @var string label operation
-     */
-    public $label_operation;
+	/**
+	 * @var string label operation
+	 */
+	public $label_operation;
 
-    /**
-     * @var float FEC:Debit
-     */
+	/**
+	 * @var float FEC:Debit
+	 */
 	public $debit;
 
-    /**
-     * @var float FEC:Credit
-     */
+	/**
+	 * @var float FEC:Credit
+	 */
 	public $credit;
 
-    /**
-     * @var float FEC:Amount (Not necessary)
-     * @deprecated Use $amount
-     */
+	/**
+	 * @var float FEC:Amount (Not necessary)
+	 * @deprecated Use $amount
+	 */
 	public $montant;
 
 	/**
@@ -138,34 +138,34 @@ class BookKeeping extends CommonObject
 	 */
 	public $amount;
 
-    /**
-     * @var string FEC:Sens (Not necessary)
-     */
+	/**
+	 * @var string FEC:Sens (Not necessary)
+	 */
 	public $sens;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
-    /**
-     * @var string key for import
-     */
+	/**
+	 * @var string key for import
+	 */
 	public $import_key;
 
-    /**
-     * @var string code journal
-     */
+	/**
+	 * @var string code journal
+	 */
 	public $code_journal;
 
-    /**
-     * @var string label journal
-     */
+	/**
+	 * @var string label journal
+	 */
 	public $journal_label;
 
-    /**
-     * @var int accounting transaction id
-     */
+	/**
+	 * @var int accounting transaction id
+	 */
 	public $piece_num;
 
 	/**
@@ -179,8 +179,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @param DoliDb $db Database handler
 	 */
-    public function __construct(DoliDB $db)
-    {
+	public function __construct(DoliDB $db)
+	{
 		$this->db = $db;
 	}
 
@@ -191,8 +191,8 @@ class BookKeeping extends CommonObject
 	 * @param  bool	$notrigger	false=launch triggers after, true=disable triggers
 	 * @return int				<0 if KO, Id of created object if OK
 	 */
-    public function create(User $user, $notrigger = false)
-    {
+	public function create(User $user, $notrigger = false)
+	{
 		global $conf, $langs;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -504,11 +504,11 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode 	   Mode
 	 * @return int				 <0 if KO, Id of created object if OK
 	 */
-    public function createStd(User $user, $notrigger = false, $mode = '')
-    {
+	public function createStd(User $user, $notrigger = false, $mode = '')
+	{
 		global $conf, $langs;
 
-        $langs->loadLangs(array("accountancy", "bills", "compta"));
+		$langs->loadLangs(array("accountancy", "bills", "compta"));
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -578,7 +578,7 @@ class BookKeeping extends CommonObject
 		$now = dol_now();
 
 		// Check parameters
-        $this->journal_label = $langs->trans($this->journal_label);
+		$this->journal_label = $langs->trans($this->journal_label);
 
 		// Insert request
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.$mode.' (';
@@ -673,8 +673,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return int <0 if KO, 0 if not found, >0 if OK
 	 */
-    public function fetch($id, $ref = null, $mode = '')
-    {
+	public function fetch($id, $ref = null, $mode = '')
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -771,8 +771,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return int <0 if KO, >=0 if OK
 	 */
-    public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
-    {
+	public function fetchAllByAccount($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -904,11 +904,11 @@ class BookKeeping extends CommonObject
 	 * @param int 			$offset                         Offset limit
 	 * @param array 		$filter                         Filter array
 	 * @param string 		$filtermode                     Filter mode (AND or OR)
-     * @param int           $showAlreadyExportMovements     Show movements when field 'date_export' is not empty (0:No / 1:Yes (Default))
+	 * @param int           $showAlreadyExportMovements     Show movements when field 'date_export' is not empty (0:No / 1:Yes (Default))
 	 * @return int                                          <0 if KO, >0 if OK
 	 */
-    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $showAlreadyExportMovements = 1)
-    {
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND', $showAlreadyExportMovements = 1)
+	{
 		global $conf;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -940,7 +940,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.date_creation,";
 		$sql .= " t.date_lim_reglement,";
 		$sql .= " t.tms as date_modification,";
-        $sql .= " t.date_export";
+		$sql .= " t.date_export";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		// Manage filter
 		$sqlwhere = array();
@@ -960,8 +960,8 @@ class BookKeeping extends CommonObject
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.tms>=' || $key == 't.tms<=') {
 					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
-                } elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
-                    $sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
+				} elseif ($key == 't.date_export>=' || $key == 't.date_export<=') {
+					$sqlwhere[] = $key.'\''.$this->db->idate($value).'\'';
 				} elseif ($key == 't.credit' || $key == 't.debit') {
 					$sqlwhere[] = natural_search($key, $value, 1, 1);
 				} else {
@@ -970,9 +970,9 @@ class BookKeeping extends CommonObject
 			}
 		}
 		$sql .= ' WHERE t.entity IN ('.getEntity('accountancy').')';
-        if ($showAlreadyExportMovements == 0) {
-            $sql .= " AND t.date_export IS NULL";
-        }
+		if ($showAlreadyExportMovements == 0) {
+			$sql .= " AND t.date_export IS NULL";
+		}
 		if (count($sqlwhere) > 0) {
 			$sql .= ' AND '.implode(' '.$filtermode.' ', $sqlwhere);
 		}
@@ -1020,7 +1020,7 @@ class BookKeeping extends CommonObject
 				$line->date_creation = $this->db->jdate($obj->date_creation);
 				$line->date_lim_reglement = $this->db->jdate($obj->date_lim_reglement);
 				$line->date_modification = $this->db->jdate($obj->date_modification);
-                $line->date_export = $this->db->jdate($obj->date_export);
+				$line->date_export = $this->db->jdate($obj->date_export);
 
 				$this->lines[] = $line;
 
@@ -1133,8 +1133,8 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode       Mode ('' or _tmp')
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-    public function update(User $user, $notrigger = false, $mode = '')
-    {
+	public function update(User $user, $notrigger = false, $mode = '')
+	{
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
@@ -1300,8 +1300,8 @@ class BookKeeping extends CommonObject
 	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function delete(User $user, $notrigger = false, $mode = '')
-    {
+	public function delete(User $user, $notrigger = false, $mode = '')
+	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -1348,8 +1348,8 @@ class BookKeeping extends CommonObject
 	 * @param  string		$importkey		Import key
 	 * @return int Result
 	 */
-    public function deleteByImportkey($importkey)
-    {
+	public function deleteByImportkey($importkey)
+	{
 		$this->db->begin();
 
 		// first check if line not yet in bookkeeping
@@ -1379,11 +1379,11 @@ class BookKeeping extends CommonObject
 	 * @param  int	  $delmonth     Month
 	 * @return int					<0 if KO, >0 if OK
 	 */
-    public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
-    {
-    	global $langs;
+	public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
+	{
+		global $langs;
 
-    	if (empty($delyear) && empty($journal))
+		if (empty($delyear) && empty($journal))
 		{
 			$this->error = 'ErrorOneFieldRequired';
 			return -1;
@@ -1428,8 +1428,8 @@ class BookKeeping extends CommonObject
 	 * @param 	int 	$piecenum 	Piecenum to delete
 	 * @return 	int 				Result
 	 */
-    public function deleteMvtNum($piecenum)
-    {
+	public function deleteMvtNum($piecenum)
+	{
 		global $conf;
 
 		$this->db->begin();
@@ -1463,8 +1463,8 @@ class BookKeeping extends CommonObject
 	 * @param   int     $fromid     Id of object to clone
 	 * @return  int                 New id of clone
 	 */
-    public function createFromClone(User $user, $fromid)
-    {
+	public function createFromClone(User $user, $fromid)
+	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -1511,8 +1511,8 @@ class BookKeeping extends CommonObject
 	 *
 	 * @return void
 	 */
-    public function initAsSpecimen()
-    {
+	public function initAsSpecimen()
+	{
 		global $user;
 
 		$now = dol_now();
@@ -1548,8 +1548,8 @@ class BookKeeping extends CommonObject
 	 * @param string $mode Mode
 	 * @return int <0 if KO, >0 if OK
 	 */
-    public function fetchPerMvt($piecenum, $mode = '')
-    {
+	public function fetchPerMvt($piecenum, $mode = '')
+	{
 		global $conf;
 
 		$sql = "SELECT piece_num,doc_date,code_journal,journal_label,doc_ref,doc_type,date_creation";
@@ -1613,8 +1613,8 @@ class BookKeeping extends CommonObject
 	 * @param  string  $mode       Mode
 	 * @return int                 <0 if KO, >0 if OK
 	 */
-    public function fetchAllPerMvt($piecenum, $mode = '')
-    {
+	public function fetchAllPerMvt($piecenum, $mode = '')
+	{
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
@@ -1664,16 +1664,16 @@ class BookKeeping extends CommonObject
 		return 1;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Export bookkeeping
 	 *
 	 * @param	string	$model	Model
 	 * @return	int				Result
 	 */
-    public function export_bookkeeping($model = 'ebp')
-    {
-        // phpcs:enable
+	public function export_bookkeeping($model = 'ebp')
+	{
+		// phpcs:enable
 		global $conf;
 
 		$sql = "SELECT rowid, doc_date, doc_type,";
@@ -1739,10 +1739,10 @@ class BookKeeping extends CommonObject
 
 		$this->db->begin();
 
-        if ($direction == 0)
+		if ($direction == 0)
 		{
 			$next_piecenum = $this->getNextNumMvt();
-            $now = dol_now();
+			$now = dol_now();
 
 			if ($next_piecenum < 0) {
 				$error++;
@@ -1819,22 +1819,22 @@ class BookKeeping extends CommonObject
 		*/
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	* Return list of accounts with label by chart of accounts
-	*
-	* @param string     $selectid   Preselected chart of accounts
-	* @param string     $htmlname	Name of field in html form
-	* @param int		$showempty	Add an empty field
-	* @param array		$event		Event options
-	* @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
-	* @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
-	* @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
-	* @return string	String with HTML select
-    */
-    public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '')
-    {
-        // phpcs:enable
+	 * Return list of accounts with label by chart of accounts
+	 *
+	 * @param string     $selectid   Preselected chart of accounts
+	 * @param string     $htmlname	Name of field in html form
+	 * @param int		$showempty	Add an empty field
+	 * @param array		$event		Event options
+	 * @param int		$select_in	Value is a aa.rowid (0 default) or aa.account_number (1)
+	 * @param int		$select_out	Set value returned by select 0=rowid (default), 1=account_number
+	 * @param int		$aabase		Set accounting_account base class to display empty=all or from 1 to 8 will display only account beginning by this number
+	 * @return string	String with HTML select
+	 */
+	public function select_account($selectid, $htmlname = 'account', $showempty = 0, $event = array(), $select_in = 0, $select_out = 0, $aabase = '')
+	{
+		// phpcs:enable
 		global $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
@@ -1891,7 +1891,7 @@ class BookKeeping extends CommonObject
 		return $out;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Description of a root accounting account
 	 *
@@ -1900,7 +1900,7 @@ class BookKeeping extends CommonObject
 	 */
 	public function get_compte_racine($account = null)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
 
@@ -1932,16 +1932,16 @@ class BookKeeping extends CommonObject
 		}
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Description of accounting account
 	 *
 	 * @param	string	$account	Accounting account
 	 * @return	string				Account desc
 	 */
-    public function get_compte_desc($account = null)
-    {
-        // phpcs:enable
+	public function get_compte_desc($account = null)
+	{
+		// phpcs:enable
 		global $conf;
 
 		$pcgver = $conf->global->CHARTOFACCOUNTS;
@@ -1989,13 +1989,13 @@ class BookKeepingLine
 	public $doc_ref;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_doc;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_docdet;
 
 	public $thirdparty_code;
@@ -2007,26 +2007,26 @@ class BookKeepingLine
 	public $debit;
 	public $credit;
 
-    /**
-     * @var float Amount
-     * @deprecated see $amount
-     */
+	/**
+	 * @var float Amount
+	 * @deprecated see $amount
+	 */
 	public $montant;
 
-    /**
-     * @var float Amount
-     */
+	/**
+	 * @var float Amount
+	 */
 	public $amount;
 
-    /**
-     * @var string Sens
-     */
-    public $sens;
-    public $lettering_code;
+	/**
+	 * @var string Sens
+	 */
+	public $sens;
+	public $lettering_code;
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_user_author;
 
 	public $import_key;
@@ -2035,17 +2035,17 @@ class BookKeepingLine
 	public $piece_num;
 
 	/**
-     * @var integer|string date_creation
-     */
+	 * @var integer|string date_creation
+	 */
 	public $date_creation;
 
 	/**
 	 * @var integer|string $date_modification;
 	 */
-    public $date_modification;
+	public $date_modification;
 
-    /**
-     * @var integer|string $date_export;
-     */
-    public $date_export;
+	/**
+	 * @var integer|string $date_export;
+	 */
+	public $date_export;
 }
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index f99f1148044..a6cf6f2fc14 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -166,7 +166,7 @@ print '<script type="text/javascript">
 $sql = "SELECT er.ref, er.rowid as erid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht, erd.fk_code_ventilation, erd.tva_tx, erd.vat_src_code, erd.date,";
 $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label,";
-$sql .= " u.rowid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
+$sql .= " u.rowid as userid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
 $sql .= " aa.label, aa.labelshort, aa.account_number";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
@@ -311,7 +311,7 @@ if ($result) {
 		$expensereportstatic->ref = $objp->ref;
 		$expensereportstatic->id = $objp->erid;
 
-		$userstatic->id = $objp->rowid;
+		$userstatic->id = $objp->userid;
 		$userstatic->ref = $objp->label;
 		$userstatic->login = $objp->login;
 		$userstatic->statut = $objp->statut;
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index c2fb21a911b..2ee3044895a 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -190,7 +190,7 @@ if (empty($chartaccountcode))
 $sql = "SELECT er.ref, er.rowid as erid, er.date_debut, er.date_valid,";
 $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, erd.fk_code_ventilation, erd.tva_tx as tva_tx_line, erd.vat_src_code, erd.date,";
 $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,";
-$sql .= " u.rowid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
+$sql .= " u.rowid as userid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
 $sql .= " aa.rowid as aarowid";
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
@@ -356,7 +356,7 @@ if ($result) {
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
 
-		$userstatic->id = $objp->rowid;
+		$userstatic->id = $objp->userid;
 		$userstatic->ref = $objp->label;
 		$userstatic->login = $objp->login;
 		$userstatic->statut = $objp->statut;
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 7062c25b108..0ed6db948a2 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -180,10 +180,10 @@ if ($result) {
 	$account_supplier			= (($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER != "") ? $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER : 'NotDefined'); // NotDefined is a reserved word
 	$account_customer			= (($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER != "") ? $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER : 'NotDefined'); // NotDefined is a reserved word
 	$account_employee			= (!empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) ? $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT : 'NotDefined'); // NotDefined is a reserved word
-	$account_pay_vat			= (!empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined'); // NotDefined is a reserved word
-	$account_pay_donation		= (!empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
-	$account_pay_subscription	= (!empty($conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT) ? $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
-	$account_transfer			= (!empty($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) ? $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH : 'NotDefined'); // NotDefined is a reserved word
+	$account_pay_vat = (!empty($conf->global->ACCOUNTING_VAT_PAY_ACCOUNT) ? $conf->global->ACCOUNTING_VAT_PAY_ACCOUNT : 'NotDefined'); // NotDefined is a reserved word
+	$account_pay_donation = (!empty($conf->global->DONATION_ACCOUNTINGACCOUNT) ? $conf->global->DONATION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
+	$account_pay_subscription = (!empty($conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT) ? $conf->global->ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT : 'NotDefined'); // NotDefined is a reserved word
+	$account_transfer = (!empty($conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH) ? $conf->global->ACCOUNTING_ACCOUNT_TRANSFER_CASH : 'NotDefined'); // NotDefined is a reserved word
 
 	$tabcompany = array();
 	$tabuser = array();
@@ -970,8 +970,9 @@ if (empty($action) || $action == 'view') {
 		$obj = $db->fetch_object($resql);
 		if ($obj->nb > 0)
 		{
-			print '<br>'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
+			print '<br><div class="warning">'.img_warning().' '.$langs->trans("TheJournalCodeIsNotDefinedOnSomeBankAccount");
 			print ' : '.$langs->trans("AccountancyAreaDescBank", 9, '<strong>'.$langs->transnoentitiesnoconv("MenuAccountancy").'-'.$langs->transnoentitiesnoconv("Setup")."-".$langs->transnoentitiesnoconv("BankAccounts").'</strong>');
+			print '</div>';
 		}
 	} else dol_print_error($db);
 
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index d0a67153209..cd432aa12d6 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -181,7 +181,12 @@ if (empty($reshook)) {
 		if ($result > 0) {
 			// Creation user
 			$nuser = new User($db);
-			$result = $nuser->create_from_member($object, GETPOST('login', 'alphanohtml'));
+			$tmpuser = dol_clone($object);
+			if (GETPOST('internalorexternal', 'aZ09') == 'internal') {
+				$tmpuser->fk_soc = 0;
+			}
+
+			$result = $nuser->create_from_member($tmpuser, GETPOST('login', 'alphanohtml'));
 
 			if ($result < 0) {
 				$langs->load("errors");
@@ -1279,11 +1284,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$formquestion = array(
 					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
 			);
-			$text = $langs->trans("ConfirmCreateLogin").'<br>';
-			if (!empty($conf->societe->enabled)) {
-				if ($object->socid > 0) $text .= $langs->trans("UserWillBeExternalUser");
-				else $text .= $langs->trans("UserWillBeInternalUser");
+			if (!empty($conf->societe->enabled) && $object->socid > 0) {
+				$object->fetch_thirdparty();
+				$formquestion[] = array('label' => $langs->trans("UserWillBe"), 'type' => 'radio', 'name' => 'internalorexternal', 'default'=>'external', 'values' => array('external'=>$langs->trans("External").' - '.$langs->trans("LinkedToDolibarrThirdParty").' '.$object->thirdparty->getNomUrl(1, '', 0, 1), 'internal'=>$langs->trans("Internal")));
 			}
+			$text = '';
+			if (!empty($conf->societe->enabled) && $object->socid <= 0) {
+				$text .= $langs->trans("UserWillBeInternalUser").'<br>';
+			}
+			$text .= $langs->trans("ConfirmCreateLogin");
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("CreateDolibarrLogin"), $text, "confirm_create_user", $formquestion, 'yes');
 		}
 
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 9396b02d518..ef4639e4b5e 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -436,7 +436,7 @@ if ($sall) {
 
 // Filter on categories
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled)) {
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= $langs->trans('Categories').': ';
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index a79355de768..017962701e4 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -110,7 +110,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			} else {
 				$db->rollback();
 
-			    if ($object->error) {
+				if ($object->error) {
 					$errmsg = $object->error;
 				} else {
 					foreach ($object->errors as $error) {
@@ -128,13 +128,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->adherent->cotisation->creer) {
 	$result = $object->fetch($rowid);
-    $result = $object->delete($user);
-    if ($result > 0) {
-    	header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
-    	exit;
-    } else {
-    	$mesg = $adh->error;
-    }
+	$result = $object->delete($user);
+	if ($result > 0) {
+		header("Location: ".DOL_URL_ROOT."/adherents/card.php?rowid=".$object->fk_adherent);
+		exit;
+	} else {
+		$mesg = $adh->error;
+	}
 }
 
 
@@ -159,7 +159,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	 *
 	 ********************************************/
 
-    $object->fetch($rowid);
+	$object->fetch($rowid);
 	$result = $adh->fetch($object->fk_adherent);
 
 	$head = subscription_prepare_head($object);
@@ -172,13 +172,13 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), 0, 'payment');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    print "\n";
+	print "\n";
 	print '<table class="border centpercent">';
 
-    // Ref
-    print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
+	// Ref
+	print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td>';
 	print '<td class="valeur" colspan="3">';
 	print $form->showrefnav($object, 'rowid', $linkback, 1);
 	print '</td></tr>';
@@ -195,24 +195,24 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 	print $form->selectarray("typeid", $adht->liste_array(), (GETPOSTISSET("typeid") ? GETPOST("typeid") : $object->fk_type));
 	print'</td></tr>';
 
-    // Date start subscription
-    print '<tr><td>'.$langs->trans("DateSubscription").'</td><td class="valeur" colspan="2">';
+	// Date start subscription
+	print '<tr><td>'.$langs->trans("DateSubscription").'</td><td class="valeur" colspan="2">';
 	print $form->selectDate($object->dateh, 'datesub', 1, 1, 0, 'update', 1);
 	print '</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Date end subscription
-    print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur" colspan="2">';
+	// Date end subscription
+	print '<tr><td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur" colspan="2">';
 	print $form->selectDate($object->datef, 'datesubend', 0, 0, 0, 'update', 1);
 	print '</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Amount
-    print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur" colspan="2">';
+	// Amount
+	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur" colspan="2">';
 	print '<input type="text" class="flat" size="10" name="amount" value="'.price($object->amount).'"></td></tr>';
 
-    // Label
-    print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">';
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur" colspan="2">';
 	print '<input type="text" class="flat" size="60" name="note" value="'.$object->note.'"></td></tr>';
 
 	// Bank line
@@ -234,11 +234,11 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
 
 	dol_fiche_end();
 
-    print '<div class="center">';
-    print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
 	print ' &nbsp; &nbsp; &nbsp; ';
 	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '</div>';
 
 	print '</form>';
 	print "\n";
@@ -251,69 +251,69 @@ if ($rowid && $action != 'edit') {
 	 *
 	 ********************************************/
 
-    $result = $object->fetch($rowid);
+	$result = $object->fetch($rowid);
 	$result = $adh->fetch($object->fk_adherent);
 
 	$head = subscription_prepare_head($object);
 
 	dol_fiche_head($head, 'general', $langs->trans("Subscription"), -1, 'payment');
 
-    // Confirmation to delete subscription
-    if ($action == 'delete') {
+	// Confirmation to delete subscription
+	if ($action == 'delete') {
 		//$formquestion=array();
-        //$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
+		//$formquestion['text']='<b>'.$langs->trans("ThisWillAlsoDeleteBankRecord").'</b>';
 		$text = $langs->trans("ConfirmDeleteSubscription");
 		if (!empty($conf->banque->enabled) && !empty($conf->global->ADHERENT_BANK_USE)) $text .= '<br>'.img_warning().' '.$langs->trans("ThisWillAlsoDeleteBankRecord");
 		print $form->formconfirm($_SERVER["PHP_SELF"]."?rowid=".$object->id, $langs->trans("DeleteSubscription"), $text, "confirm_delete", $formquestion, 0, 1);
-    }
+	}
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/subscription/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'rowid', $linkback, 1);
+	dol_banner_tab($object, 'rowid', $linkback, 1);
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    // Member
-    $adh->ref = $adh->getFullName($langs);
-    print '<tr>';
-    print '<td class="titlefield">'.$langs->trans("Member").'</td><td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
-    print '</tr>';
+	// Member
+	$adh->ref = $adh->getFullName($langs);
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("Member").'</td><td class="valeur">'.$adh->getNomUrl(1, 0, 'subscription').'</td>';
+	print '</tr>';
 
-    // Type
-    print '<tr>';
-    print '<td class="titlefield">'.$langs->trans("Type").'</td>';
-    print '<td class="valeur">';
-    if ($object->fk_type > 0 || $adh->typeid > 0) {
-    	$typeid = ($object->fk_type > 0 ? $object->fk_type : $adh->typeid);
-    	$adht->fetch($typeid);
-        print $adht->getNomUrl(1);
-    } else {
-        print $langs->trans("NoType");
-    }
-    print '</td></tr>';
+	// Type
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans("Type").'</td>';
+	print '<td class="valeur">';
+	if ($object->fk_type > 0 || $adh->typeid > 0) {
+		$typeid = ($object->fk_type > 0 ? $object->fk_type : $adh->typeid);
+		$adht->fetch($typeid);
+		print $adht->getNomUrl(1);
+	} else {
+		print $langs->trans("NoType");
+	}
+	print '</td></tr>';
 
-    // Date subscription
-    print '<tr>';
+	// Date subscription
+	print '<tr>';
 	print '<td>'.$langs->trans("DateSubscription").'</td><td class="valeur">'.dol_print_date($object->dateh, 'day').'</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Date end subscription
-    print '<tr>';
+	// Date end subscription
+	print '<tr>';
 	print '<td>'.$langs->trans("DateEndSubscription").'</td><td class="valeur">'.dol_print_date($object->datef, 'day').'</td>';
-    print '</tr>';
+	print '</tr>';
 
-    // Amount
-    print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur">'.price($object->amount).'</td></tr>';
+	// Amount
+	print '<tr><td>'.$langs->trans("Amount").'</td><td class="valeur">'.price($object->amount).'</td></tr>';
 
-    // Label
-    print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
+	// Label
+	print '<tr><td>'.$langs->trans("Label").'</td><td class="valeur">'.$object->note.'</td></tr>';
 
 	// Bank line
 	if (!empty($conf->banque->enabled)) {
@@ -330,20 +330,20 @@ if ($rowid && $action != 'edit') {
 		}
 	}
 
-    print "</table>\n";
-    print '</div>';
+	print "</table>\n";
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    /*
+	/*
      * Barre d'actions
      *
      */
-    print '<div class="tabsAction">';
+	print '<div class="tabsAction">';
 
-    if ($user->rights->adherent->cotisation->creer) {
+	if ($user->rights->adherent->cotisation->creer) {
 		if (!$bankline->rappro) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify")."</a></div>";
 		} else {
@@ -351,19 +351,19 @@ if ($rowid && $action != 'edit') {
 		}
 	}
 
-    // Delete
-    if ($user->rights->adherent->cotisation->creer) {
-        print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
-    }
+	// Delete
+	if ($user->rights->adherent->cotisation->creer) {
+		print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"]."?rowid=".$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete")."</a></div>\n";
+	}
 
-    print '</div>';
+	print '</div>';
 
 
-    print '<div class="fichecenter"><div class="fichehalfleft">';
-    print '<a name="builddoc"></a>'; // ancre
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
 
-    // Documents generes
-    /*
+	// Documents generes
+	/*
     $filename = dol_sanitizeFileName($object->ref);
     $filedir = $conf->facture->dir_output . '/' . dol_sanitizeFileName($object->ref);
     $urlsource = $_SERVER['PHP_SELF'] . '?facid=' . $object->id;
@@ -375,23 +375,23 @@ if ($rowid && $action != 'edit') {
     */
 	// Show links to link elements
 	//$linktoelem = $form->showLinkToObjectBlock($object, null, array('subscription'));
-    $somethingshown = $form->showLinkedObjectBlock($object, '');
+	$somethingshown = $form->showLinkedObjectBlock($object, '');
 
-    // Show links to link elements
-    /*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
+	// Show links to link elements
+	/*$linktoelem = $form->showLinkToObjectBlock($object,array('order'));
 	if ($linktoelem) print ($somethingshown?'':'<br>').$linktoelem;
     */
 
-    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-    // List of actions on element
-    /*
+	// List of actions on element
+	/*
     include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
     $formactions = new FormActions($db);
     $somethingshown = $formactions->showactions($object, 'invoice', $socid, 1);
     */
 
-    print '</div></div></div>';
+	print '</div></div></div>';
 }
 
 // End of page
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 3075be2ada5..5b747260a05 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -154,17 +154,20 @@ print "<br>";
 $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
-
+$getentity = ($conf->entity > 1 ? "&entity=".$conf->entity : "");
 
 // Show message
 $message = '';
-$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlvcal = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlvcal .= $urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'vcal', $urlvcal);
 $message .= '<br>';
-$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlical = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlical .=$urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'ical/ics', $urlical);
 $message .= '<br>';
-$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
+$urlrss = '<a href="'.$urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : '...').'" target="_blank">';
+$urlrss .= $urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.'&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY ?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY) : 'KEYNOTDEFINED').'</a>';
 $message .= img_picto('', 'globe').' '.$langs->trans("WebCalUrlForVCalExport", 'rss', $urlrss);
 $message .= '<br>';
 $message .= '<br>';
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 5909e4b5d5b..a099547fbc0 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -400,7 +400,7 @@ print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans(
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_NOM ? $conf->global->MAIN_INFO_SOCIETE_NOM : GETPOST("nom", 'nohtml')).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
@@ -558,13 +558,13 @@ $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="director" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MANAGERS).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
 print '</td><td>';
-print '<input name="MAIN_INFO_GDPR" id="director" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_GDPR).'"></td></tr>';
+print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth500" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_GDPR).'"></td></tr>';
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 17fa15af382..6e172656930 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -83,17 +83,17 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $defaulturl = '';
-    $defaultkey = '';
-    $defaultvalue = '';
-    $toselect = '';
-    $search_array_options = array();
+	$defaulturl = '';
+	$defaultkey = '';
+	$defaultvalue = '';
+	$toselect = '';
+	$search_array_options = array();
 }
 
 if ($action == 'setMAIN_ENABLE_DEFAULT_VALUES')
 {
-    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'MAIN_ENABLE_DEFAULT_VALUES', 0, 'chaine', 0, '', $conf->entity);
 }
 
 if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('actionmodify'))
@@ -102,57 +102,57 @@ if (($action == 'add' || (GETPOST('add') && $action != 'update')) || GETPOST('ac
 
 	if (($action == 'add' || (GETPOST('add') && $action != 'update')))
 	{
-    	if (empty($defaulturl))
-    	{
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
-    		$error++;
-    	}
-    	if (empty($defaultkey))
-    	{
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
-    		$error++;
-    	}
+		if (empty($defaulturl))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+			$error++;
+		}
+		if (empty($defaultkey))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+			$error++;
+		}
 	}
 	if (GETPOST('actionmodify'))
 	{
-	    if (empty($urlpage))
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
-	        $error++;
-	    }
-	    if (empty($key))
-	    {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
-	        $error++;
-	    }
+		if (empty($urlpage))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Url")), null, 'errors');
+			$error++;
+		}
+		if (empty($key))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Field")), null, 'errors');
+			$error++;
+		}
 	}
 
 	if (!$error)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    if ($action == 'add' || (GETPOST('add') && $action != 'update'))
-	    {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
-	    }
-	    if (GETPOST('actionmodify'))
-	    {
-		    $sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
-		    $sql .= " WHERE rowid = ".$id;
-	    }
+		if ($action == 'add' || (GETPOST('add') && $action != 'update'))
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."default_values(type, user_id, page, param, value, entity) VALUES ('".$db->escape($mode)."', 0, '".$db->escape($defaulturl)."','".$db->escape($defaultkey)."','".$db->escape($defaultvalue)."', ".$db->escape($conf->entity).")";
+		}
+		if (GETPOST('actionmodify'))
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."default_values SET page = '".$db->escape($urlpage)."', param = '".$db->escape($key)."', value = '".$db->escape($value)."'";
+			$sql .= " WHERE rowid = ".$id;
+		}
 
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
-		    $db->commit();
+			$db->commit();
 			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action = "";
 			$defaulturl = '';
 			$defaultkey = '';
 			$defaultvalue = '';
 		} else {
-	        $db->rollback();
-		    setEventMessages($db->lasterror(), null, 'errors');
+			$db->rollback();
+			setEventMessages($db->lasterror(), null, 'errors');
 			$action = '';
 		}
 	}
@@ -189,15 +189,15 @@ $param = '&mode='.$mode;
 $enabledisablehtml .= $langs->trans("EnableDefaultValues").' ';
 if (empty($conf->global->MAIN_ENABLE_DEFAULT_VALUES))
 {
-    // Button off, click to enable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=1'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml .= '</a>';
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
 } else {
-    // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=0'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml .= '</a>';
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_DEFAULT_VALUES&amp;token='.newToken().'&amp;value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
 }
 
 print load_fiche_titre($langs->trans("DefaultValues"), $enabledisablehtml, 'title_setup');
@@ -228,7 +228,7 @@ dol_fiche_head($head, $mode, '', -1, '');
 
 if ($mode == 'sortorder')
 {
-    print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
+	print info_admin($langs->trans("WarningSettingSortOrder")).'<br>';
 }
 if ($mode == 'mandatory')
 {
@@ -253,30 +253,30 @@ print_liste_field_titre($texturl, $_SERVER["PHP_SELF"], 'page,param', '', $param
 $texthelp = $langs->trans("TheKeyIsTheNameOfHtmlField");
 if ($mode != 'sortorder')
 {
-    $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
+	$textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 } else {
-    $texthelp = 'field or alias.field';
-    $textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
+	$texthelp = 'field or alias.field';
+	$textkey = $form->textwithpicto($langs->trans("Field"), $texthelp);
 }
 print_liste_field_titre($textkey, $_SERVER["PHP_SELF"], 'param', '', $param, '', $sortfield, $sortorder);
 // Value
 if ($mode != 'focus' && $mode != 'mandatory')
 {
-    if ($mode != 'sortorder')
-    {
-        $substitutionarray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount')); // Must match list into GETPOST
+	if ($mode != 'sortorder')
+	{
+		$substitutionarray = getCommonSubstitutionArray($langs, 2, array('object', 'objectamount')); // Must match list into GETPOST
 		unset($substitutionarray['__USER_SIGNATURE__']);
-        $texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-        foreach ($substitutionarray as $key => $val)
-        {
-            $texthelp .= $key.' -> '.$val.'<br>';
-        }
-        $textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
-    } else {
-        $texthelp = 'ASC or DESC';
-        $textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
-    }
-    print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
+		$texthelp = $langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+		foreach ($substitutionarray as $key => $val)
+		{
+			$texthelp .= $key.' -> '.$val.'<br>';
+		}
+		$textvalue = $form->textwithpicto($langs->trans("Value"), $texthelp, 1, 'help', '', 0, 2, 'subsitutiontooltip');
+	} else {
+		$texthelp = 'ASC or DESC';
+		$textvalue = $form->textwithpicto($langs->trans("SortOrder"), $texthelp);
+	}
+	print_liste_field_titre($textvalue, $_SERVER["PHP_SELF"], 'value', '', $param, '', $sortfield, $sortorder);
 }
 // Entity
 if (!empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,page', '', $param, '', $sortfield, $sortorder);
@@ -301,9 +301,9 @@ print '</td>';
 // Value
 if ($mode != 'focus' && $mode != 'mandatory')
 {
-    print '<td>';
-    print '<input type="text" class="flat maxwidth100onsmartphone" name="defaultvalue" value="">';
-    print '</td>';
+	print '<td>';
+	print '<input type="text" class="flat maxwidth100onsmartphone" name="defaultvalue" value="">';
+	print '</td>';
 }
 // Limit to superadmin
 if (!empty($conf->multicompany->enabled) && !$user->entity)
@@ -361,32 +361,32 @@ if ($result)
 		// Value
 		if ($mode != 'focus' && $mode != 'mandatory')
 		{
-    		print '<td>';
-    		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+			print '<td>';
+			/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
     		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
     		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
     		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
     		*/
-    		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print dol_escape_htmltag($obj->value);
-    		else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
-    		print '</td>';
+			if ($action != 'edit' || GETPOST('rowid') != $obj->rowid) print dol_escape_htmltag($obj->value);
+			else print '<input type="text" name="value" value="'.dol_escape_htmltag($obj->value).'">';
+			print '</td>';
 		}
 
-	    print '<td></td>';
+		print '<td></td>';
 
 		// Actions
 		print '<td class="center">';
 		if ($action != 'edit' || GETPOST('rowid') != $obj->rowid)
 		{
-    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
-    		print ' &nbsp; ';
-    		print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=edit&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+			print ' &nbsp; ';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&mode='.$mode.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
 		} else {
-		    print '<input type="hidden" name="page" value="'.$page.'">';
-		    print '<input type="hidden" name="rowid" value="'.$id.'">';
-		    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
-		    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-		    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+			print '<input type="hidden" name="page" value="'.$page.'">';
+			print '<input type="hidden" name="rowid" value="'.$id.'">';
+			print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : 'none').'"></div>';
+			print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+			print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
 		}
 		print '</td>';
 
@@ -395,7 +395,7 @@ if ($result)
 		$i++;
 	}
 } else {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 print '</table>';
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index e40a84db0ec..0ee07aad230 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,7 +8,7 @@
  * Copyright (C) 2011		Remy Younes				<ryounes@gmail.com>
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2016	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2019	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
@@ -91,7 +91,7 @@ $hookmanager->initHooks(array('admin'));
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 0, 15, 30, 0, 37, 0, 25, 0);
+$taborder = array(9, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 32, 33, 34, 0, 6, 0, 29, 0, 7, 24, 28, 17, 35, 36, 0, 10, 23, 12, 13, 0, 14, 0, 22, 20, 18, 21, 41, 0, 15, 30, 0, 37, 42, 0, 25, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
@@ -135,6 +135,8 @@ $tabname[37] = MAIN_DB_PREFIX."c_units";
 $tabname[38] = MAIN_DB_PREFIX."c_socialnetworks";
 $tabname[39] = MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabname[40] = MAIN_DB_PREFIX."c_stcommcontact";
+$tabname[41] = MAIN_DB_PREFIX."c_transport_mode";
+$tabname[42] = MAIN_DB_PREFIX."c_product_nature";
 
 // Dictionary labels
 $tablib = array();
@@ -178,6 +180,8 @@ $tablib[37] = "DictionaryMeasuringUnits";
 $tablib[38] = "DictionarySocialNetworks";
 $tablib[39] = "DictionaryProspectContactLevel";
 $tablib[40] = "DictionaryProspectContactStatus";
+$tablib[41] = "DictionaryTransportMode";
+$tablib[42] = "DictionaryProductNature";
 
 // Requests to extract data
 $tabsql = array();
@@ -221,6 +225,8 @@ $tabsql[37] = "SELECT r.rowid, r.code, r.label, r.short_label, r.unit_type, r.sc
 $tabsql[38] = "SELECT rowid, entity, code, label, url, icon, active FROM ".MAIN_DB_PREFIX."c_socialnetworks";
 $tabsql[39] = "SELECT code, label as libelle, sortorder, active FROM ".MAIN_DB_PREFIX."c_prospectcontactlevel";
 $tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcommcontact";
+$tabsql[41] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_transport_mode";
+$tabsql[42] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_product_nature";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -264,6 +270,8 @@ $tabsqlsort[37] = "r.unit_type ASC, r.scale ASC, r.code ASC";
 $tabsqlsort[38] = "rowid, code ASC";
 $tabsqlsort[39] = "sortorder ASC";
 $tabsqlsort[40] = "code ASC";
+$tabsqlsort[41] = "code ASC";
+$tabsqlsort[42] = "code ASC";
 
 // Field names in select result for dictionary display
 $tabfield = array();
@@ -307,6 +315,8 @@ $tabfield[37] = "code,label,short_label,unit_type,scale";
 $tabfield[38] = "code,label,url,icon,entity";
 $tabfield[39] = "code,libelle,sortorder";
 $tabfield[40] = "code,libelle,picto";
+$tabfield[41] = "code,label";
+$tabfield[42] = "code,label";
 
 // Edit field names for editing a record
 $tabfieldvalue = array();
@@ -350,6 +360,8 @@ $tabfieldvalue[37] = "code,label,short_label,unit_type,scale";
 $tabfieldvalue[38] = "code,label,url,icon";
 $tabfieldvalue[39] = "code,libelle,sortorder";
 $tabfieldvalue[40] = "code,libelle,picto";
+$tabfieldvalue[41] = "code,label";
+$tabfieldvalue[42] = "code,label";
 
 // Field names in the table for inserting a record
 $tabfieldinsert = array();
@@ -394,6 +406,8 @@ $tabfieldinsert[37] = "code,label,short_label,unit_type,scale";
 $tabfieldinsert[38] = "code,label,url,icon,entity";
 $tabfieldinsert[39] = "code,label,sortorder";
 $tabfieldinsert[40] = "code,libelle,picto";
+$tabfieldinsert[41] = "code,label";
+$tabfieldinsert[42] = "code,label";
 
 // Rowid name of field depending if field is autoincrement on or off..
 // Use "" if id field is "rowid" and has autoincrement on
@@ -439,6 +453,8 @@ $tabrowid[37] = "";
 $tabrowid[38] = "";
 $tabrowid[39] = "code";
 $tabrowid[40] = "id";
+$tabrowid[41] = "";
+$tabrowid[42] = "rowid";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
@@ -482,6 +498,8 @@ $tabcond[37] = !empty($conf->product->enabled);
 $tabcond[38] = !empty($conf->socialnetworks->enabled);
 $tabcond[39] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
 $tabcond[40] = (!empty($conf->societe->enabled) && !empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES));
+$tabcond[41] = !empty($conf->intracommreport->enabled);
+$tabcond[42] = !empty($conf->product->enabled);
 
 // List of help for fields
 $tabhelp = array();
@@ -511,12 +529,12 @@ $tabhelp[23] = array('revenuestamp_type'=>'FixedOrPercent');
 $tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[25] = array('code'=>$langs->trans('EnterAnyCode'));
 //$tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"),'picto'=>$langs->trans("PictoHelp"));
+$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
 $tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
 $tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"));
 $tabhelp[30] = array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"));
 //$tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
-$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"), 'dayrule'=>"Keep empty for a date defined with month and day (most common case).<br>Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country'=>$langs->trans("EnterACountryOnlyIfSpecificToOneCountry"), 'year'=>$langs->trans("ZeroMeansEveryYear"));
+$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"), 'dayrule'=>"Keep empty for a date defined with month and day (most common case).<br>Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country'=>$langs->trans("CountryIfSpecificToOneCountry"), 'year'=>$langs->trans("ZeroMeansEveryYear"));
 $tabhelp[33] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[34] = array('code'=>$langs->trans("EnterAnyCode"));
 $tabhelp[35] = array();
@@ -524,7 +542,9 @@ $tabhelp[36] = array('range_ik'=>$langs->trans('PrevRangeToThisRange'));
 $tabhelp[37] = array('code'=>$langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('MeasuringUnitTypeDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'));
 $tabhelp[38] = array('code'=>$langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'));
 $tabhelp[39] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[40] = array('code'=>$langs->trans("EnterAnyCode"),'picto'=>$langs->trans("PictoHelp"));
+$tabhelp[40] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
+$tabhelp[41] = array('code'=>$langs->trans("EnterAnyCode"));
+$tabhelp[42] = array('code'=>$langs->trans("EnterAnyCode"));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -568,6 +588,8 @@ $tabfieldcheck[37] = array();
 $tabfieldcheck[38] = array();
 $tabfieldcheck[39] = array();
 $tabfieldcheck[40] = array();
+$tabfieldcheck[41] = array();
+$tabfieldcheck[42] = array();
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabfieldcheck);
@@ -576,9 +598,9 @@ complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqls
 // Defaut sortorder
 if (empty($sortfield))
 {
-    $tmp1 = explode(',', $tabsqlsort[$id]);
-    $tmp2 = explode(' ', $tmp1[0]);
-    $sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
+	$tmp1 = explode(',', $tabsqlsort[$id]);
+	$tmp2 = explode(' ', $tmp1[0]);
+	$sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
 }
 
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
@@ -586,27 +608,27 @@ $elementList = array();
 $sourceList = array();
 if ($id == 11)
 {
-    $elementList = array(
-        '' => '',
-        'societe' => $langs->trans('ThirdParty'),
-        // 'proposal' => $langs->trans('Proposal'),
-        // 'order' => $langs->trans('Order'),
-        // 'invoice' => $langs->trans('Bill'),
-        'supplier_proposal' => $langs->trans('SupplierProposal'),
-        'order_supplier' => $langs->trans('SupplierOrder'),
-        'invoice_supplier' => $langs->trans('SupplierBill'),
-        // 'intervention' => $langs->trans('InterventionCard'),
-        // 'contract' => $langs->trans('Contract'),
-        'project' => $langs->trans('Project'),
-        'project_task' => $langs->trans('Task'),
-        'agenda' => $langs->trans('Agenda'),
-        'dolresource' => $langs->trans('Resource'),
-        // old deprecated
-        'propal' => $langs->trans('Proposal'),
-        'commande' => $langs->trans('Order'),
-        'facture' => $langs->trans('Bill'),
-        'fichinter' => $langs->trans('InterventionCard'),
-        'contrat' => $langs->trans('Contract'),
+	$elementList = array(
+		'' => '',
+		'societe' => $langs->trans('ThirdParty'),
+		// 'proposal' => $langs->trans('Proposal'),
+		// 'order' => $langs->trans('Order'),
+		// 'invoice' => $langs->trans('Bill'),
+		'supplier_proposal' => $langs->trans('SupplierProposal'),
+		'order_supplier' => $langs->trans('SupplierOrder'),
+		'invoice_supplier' => $langs->trans('SupplierBill'),
+		// 'intervention' => $langs->trans('InterventionCard'),
+		// 'contract' => $langs->trans('Contract'),
+		'project' => $langs->trans('Project'),
+		'project_task' => $langs->trans('Task'),
+		'agenda' => $langs->trans('Agenda'),
+		'dolresource' => $langs->trans('Resource'),
+		// old deprecated
+		'propal' => $langs->trans('Proposal'),
+		'commande' => $langs->trans('Order'),
+		'facture' => $langs->trans('Bill'),
+		'fichinter' => $langs->trans('InterventionCard'),
+		'contrat' => $langs->trans('Contract'),
 	);
 	if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) $elementList["societe"] = $langs->trans('ThirdParty');
 
@@ -642,329 +664,329 @@ if ($id == 10)
 
 if (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha'))
 {
-    $search_country_id = '';
-    $search_code = '';
+	$search_country_id = '';
+	$search_code = '';
 }
 
 // Actions add or modify an entry into a dictionary
 if (GETPOST('actionadd') || GETPOST('actionmodify'))
 {
-    $listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
-    $listfieldinsert = explode(',', $tabfieldinsert[$id]);
-    $listfieldmodify = explode(',', $tabfieldinsert[$id]);
-    $listfieldvalue = explode(',', $tabfieldvalue[$id]);
+	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
+	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-    // Check that all fields are filled
-    $ok = 1;
-    foreach ($listfield as $f => $value)
-    {
-    	// Discard check of mandatory fields for country for some tables
-        if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory
-    	if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
-        // Discard check of mandatory fiedls for other fields
-    	if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
-        if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
-        if ($value == 'color' && empty($_POST['color'])) continue;
+	// Check that all fields are filled
+	$ok = 1;
+	foreach ($listfield as $f => $value)
+	{
+		// Discard check of mandatory fields for country for some tables
+		if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) continue; // For some pages, country is not mandatory
+		if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryRevenueStamp'))) continue; // For some pages, country is not mandatory
+		// Discard check of mandatory fiedls for other fields
+		if ($value == 'localtax1' && empty($_POST['localtax1_type'])) continue;
+		if ($value == 'localtax2' && empty($_POST['localtax2_type'])) continue;
+		if ($value == 'color' && empty($_POST['color'])) continue;
 		if ($value == 'formula' && empty($_POST['formula'])) continue;
 		if ($value == 'dayrule' && empty($_POST['dayrule'])) continue;
 		if ($value == 'sortorder') continue; // For a column name 'sortorder', we use the field name 'position'
 		if ((!isset($_POST[$value]) || $_POST[$value] == '')
-        	&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
-        	&& (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
-        	)
+			&& (!in_array($listfield[$f], array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
+			&& (!($id == 10 && $listfield[$f] == 'code')) // Code is mandatory fir table 10
+			)
 		) {
-            $ok = 0;
-            $fieldnamekey = $listfield[$f];
-            // We take translate key of field
-            if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
-            if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
-            if ($fieldnamekey == 'nbjour')   $fieldnamekey = 'NbOfDays';
-            if ($fieldnamekey == 'decalage') $fieldnamekey = 'Offset';
-            if ($fieldnamekey == 'module')   $fieldnamekey = 'Module';
-            if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
-            if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
-            if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
-            if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
-            if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
-            if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
-            if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
-            if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
+			$ok = 0;
+			$fieldnamekey = $listfield[$f];
+			// We take translate key of field
+			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label'))  $fieldnamekey = 'Label';
+			if ($fieldnamekey == 'libelle_facture') $fieldnamekey = 'LabelOnDocuments';
+			if ($fieldnamekey == 'nbjour')   $fieldnamekey = 'NbOfDays';
+			if ($fieldnamekey == 'decalage') $fieldnamekey = 'Offset';
+			if ($fieldnamekey == 'module')   $fieldnamekey = 'Module';
+			if ($fieldnamekey == 'code') $fieldnamekey = 'Code';
+			if ($fieldnamekey == 'note') $fieldnamekey = 'Note';
+			if ($fieldnamekey == 'taux') $fieldnamekey = 'Rate';
+			if ($fieldnamekey == 'type') $fieldnamekey = 'Type';
+			if ($fieldnamekey == 'position') $fieldnamekey = 'Position';
+			if ($fieldnamekey == 'unicode') $fieldnamekey = 'Unicode';
+			if ($fieldnamekey == 'deductible') $fieldnamekey = 'Deductible';
+			if ($fieldnamekey == 'sortorder') $fieldnamekey = 'SortOrder';
 			if ($fieldnamekey == 'category_type') $fieldnamekey = 'Calculated';
 			if ($fieldnamekey == 'revenuestamp_type') $fieldnamekey = 'TypeOfRevenueStamp';
 			if ($fieldnamekey == 'use_default') $fieldnamekey = 'UseByDefault';
 
-            setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-        }
-    }
-    // Other checks
-    if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
-        $ok = 0;
-        setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
-    }
-    if (GETPOSTISSET("code"))
-    {
-    	if (GETPOST("code") == '0')
-    	{
-        	$ok = 0;
-    		setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
-        }
-        /*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+		}
+	}
+	// Other checks
+	if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && isset($_POST["type"]) && in_array($_POST["type"], array('system', 'systemauto'))) {
+		$ok = 0;
+		setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
+	}
+	if (GETPOSTISSET("code"))
+	{
+		if (GETPOST("code") == '0')
+		{
+			$ok = 0;
+			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+		}
+		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
     	{
 	    	$ok = 0;
 	    	$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
 	    }*/
-    }
-    if (GETPOSTISSET("country") && ($_POST["country"] == '0') && ($id != 2))
-    {
-    	if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
-    	{
-    		$_POST["country"] = '';
-    	} else {
-        	$ok = 0;
-        	setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
-    	}
-    }
-    if ($id == 3 && !is_numeric($_POST["code"]))
-    {
-       	$ok = 0;
-       	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
-    }
+	}
+	if (GETPOSTISSET("country") && ($_POST["country"] == '0') && ($id != 2))
+	{
+		if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes')))	// Field country is no mandatory for such dictionaries
+		{
+			$_POST["country"] = '';
+		} else {
+			$ok = 0;
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
+		}
+	}
+	if ($id == 3 && !is_numeric($_POST["code"]))
+	{
+	   	$ok = 0;
+	   	setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
+	}
 
 	// Clean some parameters
-    if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"] = '0'; // If empty, we force to 0
-    if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"] = '0'; // If empty, we force to 0
+	if ((!empty($_POST["localtax1_type"]) || ($_POST['localtax1_type'] == '0')) && empty($_POST["localtax1"])) $_POST["localtax1"] = '0'; // If empty, we force to 0
+	if ((!empty($_POST["localtax2_type"]) || ($_POST['localtax2_type'] == '0')) && empty($_POST["localtax2"])) $_POST["localtax2"] = '0'; // If empty, we force to 0
 	if ($_POST["accountancy_code"] <= 0) $_POST["accountancy_code"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_sell"] <= 0) $_POST["accountancy_code_sell"] = ''; // If empty, we force to null
 	if ($_POST["accountancy_code_buy"] <= 0) $_POST["accountancy_code_buy"] = ''; // If empty, we force to null
-    if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code
-    {
-        $_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
-    }
+	if ($id == 10 && isset($_POST["code"]))  // Spaces are not allowed into code
+	{
+		$_POST["code"] = preg_replace('/\s/', '', $_POST["code"]);
+	}
 
-    // If check ok and action add, add the line
-    if ($ok && GETPOST('actionadd'))
-    {
-        if ($tabrowid[$id])
-        {
-            // Get free id for insert
-            $newid = 0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $obj = $db->fetch_object($result);
-                $newid = ($obj->newid + 1);
-            } else {
-                dol_print_error($db);
-            }
-        }
+	// If check ok and action add, add the line
+	if ($ok && GETPOST('actionadd'))
+	{
+		if ($tabrowid[$id])
+		{
+			// Get free id for insert
+			$newid = 0;
+			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$obj = $db->fetch_object($result);
+				$newid = ($obj->newid + 1);
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $tabrowid[$id].",";
-        $sql .= $tabfieldinsert[$id];
-        $sql .= ",active)";
-        $sql .= " VALUES(";
+		// Add new entry
+		$sql = "INSERT INTO ".$tabname[$id]." (";
+		// List of fields
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $tabrowid[$id].",";
+		$sql .= $tabfieldinsert[$id];
+		$sql .= ",active)";
+		$sql .= " VALUES(";
 
-        // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $newid.",";
-        $i = 0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-        	$keycode = $listfieldvalue[$i];
-        	if (empty($keycode)) $keycode = $value;
+		// List of values
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $newid.",";
+		$i = 0;
+		foreach ($listfieldinsert as $f => $value)
+		{
+			$keycode = $listfieldvalue[$i];
+			if (empty($keycode)) $keycode = $value;
 
-            if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
-            	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            } elseif ($value == 'entity') {
-            	$_POST[$keycode] = getEntity($tabname[$id]);
-            }
+			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
+				$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
+			} elseif ($value == 'entity') {
+				$_POST[$keycode] = getEntity($tabname[$id]);
+			}
 
-            if ($i) $sql .= ",";
+			if ($i) $sql .= ",";
 
-            if ($keycode == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
-            {
-            	$sql .= "'".(int) GETPOST('position', 'int')."'";
-            } elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
-            elseif ($keycode == 'content') {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            } elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
-            	$sql .= (int) GETPOST($keycode, 'int');
-            } else {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
-            }
+			if ($keycode == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
+			{
+				$sql .= "'".(int) GETPOST('position', 'int')."'";
+			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+			elseif ($keycode == 'content') {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+			} elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
+				$sql .= (int) GETPOST($keycode, 'int');
+			} else {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+			}
 
-            $i++;
-        }
-        $sql .= ",1)";
+			$i++;
+		}
+		$sql .= ",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	$_POST = array('id'=>$id); // Clean $_POST array, we keep only
-        } else {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            } else {
-                dol_print_error($db);
-            }
-        }
-    }
+		dol_syslog("actionadd", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)	// Add is ok
+		{
+			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+		} else {
+			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
 
-    // If verif ok and action modify, modify the line
-    if ($ok && GETPOST('actionmodify'))
-    {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	// If verif ok and action modify, modify the line
+	if ($ok && GETPOST('actionmodify'))
+	{
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-        {
-            $sql .= $tabrowid[$id]."=";
-            $sql .= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-        	$keycode = $listfieldvalue[$i];
-        	if (empty($keycode)) $keycode = $field;
+		// Modify entry
+		$sql = "UPDATE ".$tabname[$id]." SET ";
+		// Modifie valeur des champs
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
+		{
+			$sql .= $tabrowid[$id]."=";
+			$sql .= "'".$db->escape($rowid)."', ";
+		}
+		$i = 0;
+		foreach ($listfieldmodify as $field)
+		{
+			$keycode = $listfieldvalue[$i];
+			if (empty($keycode)) $keycode = $field;
 
-            if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
-            	$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
-            } elseif ($field == 'entity') {
-            	$_POST[$keycode] = getEntity($tabname[$id]);
-            }
+			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
+				$_POST[$keycode] = price2num($_POST[$keycode], 'MU');
+			} elseif ($field == 'entity') {
+				$_POST[$keycode] = getEntity($tabname[$id]);
+			}
 
-            if ($i) $sql .= ",";
-            $sql .= $field."=";
-            if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
-            {
-            	$sql .= (int) GETPOST('position', 'int');
-            } elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
-            elseif ($keycode == 'content') {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-            } elseif (in_array($keycode, array('private', 'position', 'scale'))) {
-            	$sql .= (int) GETPOST($keycode, 'int');
-            } else {
-            	$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
-            }
+			if ($i) $sql .= ",";
+			$sql .= $field."=";
+			if ($listfieldvalue[$i] == 'sortorder')		// For column name 'sortorder', we use the field name 'position'
+			{
+				$sql .= (int) GETPOST('position', 'int');
+			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) $sql .= "null"; // For vat, we want/accept code = ''
+			elseif ($keycode == 'content') {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+			} elseif (in_array($keycode, array('private', 'position', 'scale'))) {
+				$sql .= (int) GETPOST($keycode, 'int');
+			} else {
+				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+			}
 
-            $i++;
-        }
-        $sql .= " WHERE ".$rowidcol." = ".(int) $db->escape($rowid);
-        if (in_array('entity', $listfieldmodify)) $sql .= " AND entity = '".getEntity($tabname[$id])."'";
+			$i++;
+		}
+		$sql .= " WHERE ".$rowidcol." = ".(int) $db->escape($rowid);
+		if (in_array('entity', $listfieldmodify)) $sql .= " AND entity = '".getEntity($tabname[$id])."'";
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if (!$resql)
-        {
-            setEventMessages($db->error(), null, 'errors');
-        }
-    }
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+		dol_syslog("actionmodify", LOG_DEBUG);
+		//print $sql;
+		$resql = $db->query($sql);
+		if (!$resql)
+		{
+			setEventMessages($db->error(), null, 'errors');
+		}
+	}
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if (GETPOST('actioncancel'))
 {
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	$sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 
-    dol_syslog("delete", LOG_DEBUG);
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-        {
-            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-        } else {
-            dol_print_error($db);
-        }
-    }
+	dol_syslog("delete", LOG_DEBUG);
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+		{
+			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+		} else {
+			dol_print_error($db);
+		}
+	}
 }
 
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // favorite
 if ($action == 'activate_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable favorite
 if ($action == 'disable_favorite')
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    } elseif ($code) {
-    	$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	} elseif ($code) {
+		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -982,28 +1004,28 @@ llxHeader('', $title);
 $linkback = '';
 if ($id)
 {
-    $title .= ' - '.$langs->trans($tablib[$id]);
-    $linkback = '<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
+	$title .= ' - '.$langs->trans($tablib[$id]);
+	$linkback = '<a href="'.$_SERVER['PHP_SELF'].'">'.$langs->trans("BackToDictionaryList").'</a>';
 }
 $titlepicto = 'title_setup';
 if ($id == 10 && GETPOST('from') == 'accountancy')
 {
-    $title = $langs->trans("MenuVatAccounts");
-    $titlepicto = 'accountancy';
+	$title = $langs->trans("MenuVatAccounts");
+	$titlepicto = 'accountancy';
 }
 if ($id == 7 && GETPOST('from') == 'accountancy')
 {
-    $title = $langs->trans("MenuTaxAccounts");
-    $titlepicto = 'accountancy';
+	$title = $langs->trans("MenuTaxAccounts");
+	$titlepicto = 'accountancy';
 }
 
 print load_fiche_titre($title, $linkback, $titlepicto);
 
 if (empty($id))
 {
-    print '<span class="opacitymedium">'.$langs->trans("DictionaryDesc");
-    print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
-    print '</span><br>';
+	print '<span class="opacitymedium">'.$langs->trans("DictionaryDesc");
+	print " ".$langs->trans("OnlyActiveElementsAreShown")."<br>\n";
+	print '</span><br>';
 }
 
 
@@ -1020,7 +1042,7 @@ if (GETPOST('from')) $paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alp
 // Confirmation of the deletion of the line
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
 //var_dump($elementList);
 
@@ -1029,126 +1051,122 @@ if ($action == 'delete')
  */
 if ($id)
 {
-    // Complete search values request with sort criteria
-    $sql = $tabsql[$id];
+	// Complete search values request with sort criteria
+	$sql = $tabsql[$id];
 
-    if (!preg_match('/ WHERE /', $sql)) $sql .= " WHERE 1 = 1";
-    if ($search_country_id > 0) $sql .= " AND c.rowid = ".$search_country_id;
-    if ($search_code != '' && $id == 9)     $sql .= natural_search("code_iso", $search_code);
-    elseif ($search_code != '' && $id == 28)    $sql .= natural_search("h.code", $search_code);
-    elseif ($search_code != '' && $id == 32)    $sql .= natural_search("a.code", $search_code);
-    elseif ($search_code != '' && $id == 3)     $sql .= natural_search("r.code_region", $search_code);
-    elseif ($search_code != '' && $id != 9)     $sql .= natural_search("code", $search_code);
+	if (!preg_match('/ WHERE /', $sql)) $sql .= " WHERE 1 = 1";
+	if ($search_country_id > 0) $sql .= " AND c.rowid = ".$search_country_id;
+	if ($search_code != '' && $id == 9)     $sql .= natural_search("code_iso", $search_code);
+	elseif ($search_code != '' && $id == 28)    $sql .= natural_search("h.code", $search_code);
+	elseif ($search_code != '' && $id == 32)    $sql .= natural_search("a.code", $search_code);
+	elseif ($search_code != '' && $id == 3)     $sql .= natural_search("r.code_region", $search_code);
+	elseif ($search_code != '' && $id != 9)     $sql .= natural_search("code", $search_code);
 
-    if ($sortfield)
-    {
-        // If sort order is "country", we use country_code instead
-    	if ($sortfield == 'country') $sortfield = 'country_code';
-        $sql .= " ORDER BY ".$db->escape($sortfield);
-        if ($sortorder)
-        {
-        	$sql .= " ".strtoupper($db->escape($sortorder));
-        }
-        $sql .= ", ";
-        // Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
-        $tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
-    } else {
-        $sql .= " ORDER BY ";
-    }
-    $sql .= $tabsqlsort[$id];
-    $sql .= $db->plimit($listlimit + 1, $offset);
-    //print $sql;
+	if ($sortfield)
+	{
+		// If sort order is "country", we use country_code instead
+		if ($sortfield == 'country') $sortfield = 'country_code';
+		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= ", ";
+		// Clear the required sort criteria for the tabsqlsort to be able to force it with selected value
+		$tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.' '.$sortorder.',/i', '', $tabsqlsort[$id]);
+		$tabsqlsort[$id] = preg_replace('/([a-z]+\.)?'.$sortfield.',/i', '', $tabsqlsort[$id]);
+	} else {
+		$sql .= " ORDER BY ";
+	}
+	$sql .= $tabsqlsort[$id];
+	$sql .= $db->plimit($listlimit + 1, $offset);
+	//print $sql;
 
-    if (empty($tabfield[$id]))
-    {
-    	dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
-    	exit;
-    }
-    $fieldlist = explode(',', $tabfield[$id]);
+	if (empty($tabfield[$id]))
+	{
+		dol_print_error($db, 'The table with id '.$id.' has no array tabfield defined');
+		exit;
+	}
+	$fieldlist = explode(',', $tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
-    if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION))
-    {
-    	print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
-    	print "<br>\n";
-    }
+	if ($id == 10 && empty($conf->global->FACTURE_TVAOPTION))
+	{
+		print info_admin($langs->trans("VATIsUsedIsOff", $langs->transnoentities("Setup"), $langs->transnoentities("CompanyFoundation")));
+		print "<br>\n";
+	}
 
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused = 0;
-        $withentity = null;
+	// Form to add a new line
+	if ($tabname[$id])
+	{
+		$alabelisused = 0;
+		$withentity = null;
 
-        $fieldlist = explode(',', $tabfield[$id]);
+		$fieldlist = explode(',', $tabfield[$id]);
 
-	    print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
 
-        // Line for title
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') {
-        		$withentity = getEntity($tabname[$id]);
-        		continue;
-        	}
+		// Line for title
+		$tdsoffields = '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') {
+				$withentity = getEntity($tabname[$id]);
+				continue;
+			}
 
-            // Define field friendly name from its technical name
-            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            $class = '';
+			// Define field friendly name from its technical name
+			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			$class = '';
 
-            if ($fieldlist[$field] == 'pos') { $valuetoshow = $langs->trans("Position"); $class = 'maxwidth100'; }
-            if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
-            if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
-            if ($fieldlist[$field] == 'taux') {
+			if ($fieldlist[$field] == 'pos') { $valuetoshow = $langs->trans("Position"); $class = 'maxwidth100'; }
+			if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
+			if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
+			if ($fieldlist[$field] == 'taux') {
 				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow = $langs->trans("Rate");
 				else $valuetoshow = $langs->trans("Amount");
 				$class = 'center';
-            }
-            if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $class = "center"; }
-            if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $class = "center"; }
-            if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($fieldlist[$field] == 'type') {
+			}
+			if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $class = "center"; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $class = "center"; }
+			if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $class = "center"; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $class = "center"; }
+			if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($fieldlist[$field] == 'type') {
 				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") $valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
 				else $valuetoshow = $langs->trans("Type");
-            }
-            if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); $class = 'maxwidth100'; }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
-            {
-            	$valuetoshow = $form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
-            }
-            if ($fieldlist[$field] == 'libelle_facture') {
-                $valuetoshow = $form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
-            }
-            if ($fieldlist[$field] == 'country') {
-                if (in_array('region_id', $fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
-                $valuetoshow = $langs->trans("Country");
-            }
-            if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $class = "center"; }
-            if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
-            if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center"; }
-            if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
-            if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
-            if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
-            if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $valuetoshow = ''; }
-            if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); }
-            if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); }
-            if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
-            if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountparent"); }
-            if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
-            if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
-	        if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
+			}
+			if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); $class = 'maxwidth100'; }
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label')
+			{
+				$valuetoshow = $form->textwithtooltip($langs->trans("Label"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
+			}
+			if ($fieldlist[$field] == 'libelle_facture') {
+				$valuetoshow = $form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
+			}
+			if ($fieldlist[$field] == 'country') {
+				if (in_array('region_id', $fieldlist)) { print '<td>&nbsp;</td>'; continue; }		// For region page, we do not show the country input
+				$valuetoshow = $langs->trans("Country");
+			}
+			if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $class = "center"; }
+			if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
+			if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center"; }
+			if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
+			if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
+			if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
+			if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $valuetoshow = ''; }
+			if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
+			if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); }
+			if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); }
+			if ($fieldlist[$field] == 'pcg_version' || $fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
+			if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountparent"); }
+			if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
+			if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
+			if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
+			if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
 			if ($fieldlist[$field] == 'range_account') { $valuetoshow = $langs->trans("Range"); }
 			if ($fieldlist[$field] == 'sens') { $valuetoshow = $langs->trans("Sens"); }
 			if ($fieldlist[$field] == 'category_type') { $valuetoshow = $langs->trans("Calculated"); }
@@ -1170,416 +1188,428 @@ if ($id)
 			if ($fieldlist[$field] == 'range_ik') { $valuetoshow = $langs->trans("RangeIk"); }
 			if ($fieldlist[$field] == 'fk_c_exp_tax_cat') { $valuetoshow = $langs->trans("CarCategory"); }
 			if ($fieldlist[$field] == 'revenuestamp_type') { $valuetoshow = $langs->trans('TypeOfRevenueStamp'); }
-			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); }
+			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); $class = 'center'; }
+			if ($fieldlist[$field] == 'unit_type') { $valuetoshow = $langs->trans('TypeOfUnit'); }
 
-            if ($id == 2)	// Special case for state page
-            {
-                if ($fieldlist[$field] == 'region_id') { $valuetoshow = '&nbsp;'; $showfield = 1; }
-                if ($fieldlist[$field] == 'region') { $valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region"); $showfield = 1; }
-            }
+			if ($id == 2)	// Special case for state page
+			{
+				if ($fieldlist[$field] == 'region_id') { $valuetoshow = '&nbsp;'; $showfield = 1; }
+				if ($fieldlist[$field] == 'region') { $valuetoshow = $langs->trans("Country").'/'.$langs->trans("Region"); $showfield = 1; }
+			}
 
-            if ($valuetoshow != '')
-            {
-                print '<td'.($class ? ' class="'.$class.'"' : '').'>';
-                if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-                elseif (!empty($tabhelp[$id][$value])) print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-                else print $valuetoshow;
-                print '</td>';
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
-        }
+			if ($valuetoshow != '')
+			{
+				$tdsoffields .= '<td'.($class ? ' class="'.$class.'"' : '').'>';
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) $tdsoffields .= '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value])) $tdsoffields .= $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				else $tdsoffields .= $valuetoshow;
+				$tdsoffields .= '</td>';
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+		}
 
-        if ($id == 4) print '<td></td>';
-        print '<td>';
-        print '<input type="hidden" name="id" value="'.$id.'">';
-        if (!is_null($withentity))
-        	print '<input type="hidden" name="entity" value="'.$withentity.'">';
-        print '</td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '<td style="min-width: 26px;"></td>';
-        print '</tr>';
+		if ($id == 4) $tdsoffields .= '<td></td>';
+		$tdsoffields .= '<td>';
+		$tdsoffields .= '<input type="hidden" name="id" value="'.$id.'">';
+		if (!is_null($withentity))
+			$tdsoffields .= '<input type="hidden" name="entity" value="'.$withentity.'">';
+		$tdsoffields .= '</td>';
+		$tdsoffields .= '<td style="min-width: 26px;"></td>';
+		$tdsoffields .= '<td style="min-width: 26px;"></td>';
+		$tdsoffields .= '</tr>';
 
-        // Line to enter new values
-        print '<!-- line to add new entry -->';
-        print '<tr class="oddeven nodrag nodrop nohover">';
+		print $tdsoffields;
 
-        $obj = new stdClass();
-        // If data was already input, we define them in obj to populate input fields.
-        if (GETPOST('actionadd'))
-        {
-            foreach ($fieldlist as $key=>$val)
-            {
-                if (GETPOST($val) != '')
-                	$obj->$val = GETPOST($val);
-            }
-        }
 
-        $tmpaction = 'create';
-        $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-        $reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-        $error = $hookmanager->error; $errors = $hookmanager->errors;
+		$obj = new stdClass();
+		// If data was already input, we define them in obj to populate input fields.
+		if (GETPOST('actionadd'))
+		{
+			foreach ($fieldlist as $key=>$val)
+			{
+				if (GETPOST($val) != '')
+					$obj->$val = GETPOST($val);
+			}
+		}
 
-        if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
+		$tmpaction = 'create';
+		$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+		$reshook = $hookmanager->executeHooks('createDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+		$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-        if (empty($reshook))
-        {
-       		fieldList($fieldlist, $obj, $tabname[$id], 'add');
-        }
+		if ($id == 3) unset($fieldlist[2]); // Remove field ??? if dictionary Regions
 
-        if ($id == 4) print '<td></td>';
-        print '<td colspan="3" class="center">';
-        if ($action != 'edit')
-        {
-        	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-        }
-        print '</td>';
-        print "</tr>";
+		// Line to enter new values
+		print '<!-- line to add new entry -->';
+		print '<tr class="oddeven nodrag nodrop nohover">';
 
-        $colspan = count($fieldlist) + 3;
-        if ($id == 4) $colspan++;
+		if (empty($reshook))
+		{
+	   		fieldList($fieldlist, $obj, $tabname[$id], 'add');
+		}
 
-        print '</table>';
+		if ($id == 4) print '<td></td>';
+		print '<td colspan="3" class="center">';
+		if ($action != 'edit')
+		{
+			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		}
+		print '</td>';
+
+		print "</tr>";
+
+		print '</table>';
 		print '</div>';
-    }
+	}
 
-    print '</form>';
+	print '</form>';
 
 
-    print '<br>';
+	print '<br>';
 
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
 
-    // List of available record in database
-    dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+	// List of available record in database
+	dol_syslog("htdocs/admin/dict", LOG_DEBUG);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
 
-        // There is several pages
-        if ($num > $listlimit || $page)
-        {
-            print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
-            print '<div class="clearboth"></div>';
-        }
+		// There is several pages
+		if ($num > $listlimit || $page)
+		{
+			print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
+			print '<div class="clearboth"></div>';
+		}
 
-	    print '<div class="div-table-responsive">';
-        print '<table class="noborder centpercent">';
+		print '<div class="div-table-responsive">';
+		print '<table class="noborder centpercent">';
 
-        // Title line with search input fields
-        print '<tr class="liste_titre_filter">';
-        $filterfound = 0;
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') continue;
+		// Title line with search input fields
+		print '<tr class="liste_titre_filter">';
+		$filterfound = 0;
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') continue;
 
-            $showfield = 1; // By default
-
-            if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
-
-            if ($showfield)
-            {
-                if ($value == 'country')
-                {
-                    print '<td class="liste_titre">';
-                    print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
-                    print '</td>';
-                    $filterfound++;
-                } elseif ($value == 'code')
-                {
-                    print '<td class="liste_titre">';
-                    print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
-                    print '</td>';
-                    $filterfound++;
-                } else {
-                    print '<td class="liste_titre">';
-                    print '</td>';
-                }
-            }
-        }
-        if ($id == 4) print '<td></td>';
-        print '<td class="liste_titre"></td>';
-    	print '<td class="liste_titre right" colspan="2">';
-    	if ($filterfound)
-    	{
-        	$searchpicto = $form->showFilterAndCheckAddButtons(0);
-        	print $searchpicto;
-    	}
-    	print '</td>';
-        print '</tr>';
-
-        // Title of lines
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-        	if ($fieldlist[$field] == 'entity') continue;
-
-            // Determines the name of the field in relation to the possible names
-            // in data dictionaries
-            $showfield = 1; // By defaut
-            $cssprefix = '';
-            $sortable = 1;
-            $valuetoshow = ucfirst($fieldlist[$field]); // By defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-
-            // Special cases
-            if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
-            if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
-            if ($fieldlist[$field] == 'taux') {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow = $langs->trans("Rate");
-				else $valuetoshow = $langs->trans("Amount");
-				$cssprefix = 'center ';
-            }
-            if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $cssprefix = "center "; $sortable = 0; }
-            if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-            if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
-            if ($fieldlist[$field] == 'position') { $cssprefix = 'right '; }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Label"); }
-            if ($fieldlist[$field] == 'libelle_facture') { $valuetoshow = $langs->trans("LabelOnDocuments"); }
-            if ($fieldlist[$field] == 'country') { $valuetoshow = $langs->trans("Country"); }
-            if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $cssprefix = "center "; }
-            if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
-            if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center "; }
-            if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
-            if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
-            if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
-            if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
-            if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
-            if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); $sortable = 0; }
-            if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); $sortable = 0; }
-			if ($fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
-            if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountsparent"); }
-            if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
-            if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
-            if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
-            if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
-			if ($fieldlist[$field] == 'range_account') { $valuetoshow = $langs->trans("Range"); }
-			if ($fieldlist[$field] == 'sens') { $valuetoshow = $langs->trans("Sens"); }
-			if ($fieldlist[$field] == 'category_type') { $valuetoshow = $langs->trans("Calculated"); }
-			if ($fieldlist[$field] == 'formula') { $valuetoshow = $langs->trans("Formula"); }
-			if ($fieldlist[$field] == 'paper_size') { $valuetoshow = $langs->trans("PaperSize"); }
-			if ($fieldlist[$field] == 'orientation') { $valuetoshow = $langs->trans("Orientation"); }
-			if ($fieldlist[$field] == 'leftmargin') { $valuetoshow = $langs->trans("LeftMargin"); }
-			if ($fieldlist[$field] == 'topmargin') { $valuetoshow = $langs->trans("TopMargin"); }
-			if ($fieldlist[$field] == 'spacex') { $valuetoshow = $langs->trans("SpaceX"); }
-			if ($fieldlist[$field] == 'spacey') { $valuetoshow = $langs->trans("SpaceY"); }
-			if ($fieldlist[$field] == 'font_size') { $valuetoshow = $langs->trans("FontSize"); }
-			if ($fieldlist[$field] == 'custom_x') { $valuetoshow = $langs->trans("CustomX"); }
-			if ($fieldlist[$field] == 'custom_y') { $valuetoshow = $langs->trans("CustomY"); }
-			if ($fieldlist[$field] == 'percent') { $valuetoshow = $langs->trans("Percentage"); }
-			if ($fieldlist[$field] == 'affect') { $valuetoshow = $langs->trans("WithCounter"); }
-			if ($fieldlist[$field] == 'delay') { $valuetoshow = $langs->trans("NoticePeriod"); }
-			if ($fieldlist[$field] == 'newbymonth') { $valuetoshow = $langs->trans("NewByMonth"); }
-			if ($fieldlist[$field] == 'fk_tva') { $valuetoshow = $langs->trans("VAT"); }
-			if ($fieldlist[$field] == 'range_ik') { $valuetoshow = $langs->trans("RangeIk"); }
-			if ($fieldlist[$field] == 'fk_c_exp_tax_cat') { $valuetoshow = $langs->trans("CarCategory"); }
-			if ($fieldlist[$field] == 'revenuestamp_type') { $valuetoshow = $langs->trans('TypeOfRevenueStamp'); }
-			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); }
+			$showfield = 1; // By default
 
 			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
 
-            // Show field title
-            if ($showfield)
-            {
-                print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
-            }
-        }
+			if ($showfield)
+			{
+				if ($value == 'country')
+				{
+					print '<td class="liste_titre">';
+					print $form->select_country($search_country_id, 'search_country_id', '', 28, 'maxwidth150 maxwidthonsmartphone');
+					print '</td>';
+					$filterfound++;
+				} elseif ($value == 'code')
+				{
+					print '<td class="liste_titre">';
+					print '<input type="text" class="maxwidth100" name="search_code" value="'.dol_escape_htmltag($search_code).'">';
+					print '</td>';
+					$filterfound++;
+				} else {
+					print '<td class="liste_titre">';
+					print '</td>';
+				}
+			}
+		}
+		if ($id == 4) print '<td></td>';
+		print '<td class="liste_titre"></td>';
+		print '<td class="liste_titre right" colspan="2">';
+		if ($filterfound)
+		{
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Title of lines
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			if ($fieldlist[$field] == 'entity') continue;
+
+			if (in_array($value, array('label', 'libelle', 'libelle_facture')) && empty($tabhelp[$id][$value])) {
+				$tabhelp[$id][$value] = $langs->trans('LabelUsedByDefault');
+			}
+
+			// Determines the name of the field in relation to the possible names
+			// in data dictionaries
+			$showfield = 1; // By defaut
+			$cssprefix = '';
+			$sortable = 1;
+			$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+
+			// Special cases
+			if ($fieldlist[$field] == 'source') { $valuetoshow = $langs->trans("Contact"); }
+			if ($fieldlist[$field] == 'price') { $valuetoshow = $langs->trans("PriceUHT"); }
+			if ($fieldlist[$field] == 'taux') {
+				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") $valuetoshow = $langs->trans("Rate");
+				else $valuetoshow = $langs->trans("Amount");
+				$cssprefix = 'center ';
+			}
+			if ($fieldlist[$field] == 'localtax1_type') { $valuetoshow = $langs->trans("UseLocalTax")." 2"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax1') { $valuetoshow = $langs->trans("Rate")." 2"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2_type') { $valuetoshow = $langs->trans("UseLocalTax")." 3"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'localtax2') { $valuetoshow = $langs->trans("Rate")." 3"; $cssprefix = "center "; $sortable = 0; }
+			if ($fieldlist[$field] == 'organization') { $valuetoshow = $langs->trans("Organization"); }
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+			if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+			if ($fieldlist[$field] == 'pos') { $cssprefix = 'right '; $valuetoshow = $langs->trans("Position"); }
+			if ($fieldlist[$field] == 'position') { $cssprefix = 'right '; $valuetoshow = $langs->trans("Position"); }
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Label"); }
+			if ($fieldlist[$field] == 'libelle_facture') { $valuetoshow = $langs->trans("LabelOnDocuments"); }
+			if ($fieldlist[$field] == 'country') { $valuetoshow = $langs->trans("Country"); }
+			if ($fieldlist[$field] == 'recuperableonly') { $valuetoshow = $langs->trans("NPR"); $cssprefix = "center "; }
+			if ($fieldlist[$field] == 'nbjour') { $valuetoshow = $langs->trans("NbOfDays"); }
+			if ($fieldlist[$field] == 'type_cdr') { $valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center "; }
+			if ($fieldlist[$field] == 'decalage') { $valuetoshow = $langs->trans("Offset"); }
+			if ($fieldlist[$field] == 'width' || $fieldlist[$field] == 'nx') { $valuetoshow = $langs->trans("Width"); }
+			if ($fieldlist[$field] == 'height' || $fieldlist[$field] == 'ny') { $valuetoshow = $langs->trans("Height"); }
+			if ($fieldlist[$field] == 'unit' || $fieldlist[$field] == 'metric') { $valuetoshow = $langs->trans("MeasuringUnit"); }
+			if ($fieldlist[$field] == 'accountancy_code') { $valuetoshow = $langs->trans("AccountancyCode"); }
+			if ($fieldlist[$field] == 'accountancy_code_sell') { $valuetoshow = $langs->trans("AccountancyCodeSell"); $sortable = 0; }
+			if ($fieldlist[$field] == 'accountancy_code_buy') { $valuetoshow = $langs->trans("AccountancyCodeBuy"); $sortable = 0; }
+			if ($fieldlist[$field] == 'fk_pcg_version') { $valuetoshow = $langs->trans("Pcg_version"); }
+			if ($fieldlist[$field] == 'account_parent') { $valuetoshow = $langs->trans("Accountsparent"); }
+			if ($fieldlist[$field] == 'pcg_type') { $valuetoshow = $langs->trans("Pcg_type"); }
+			if ($fieldlist[$field] == 'pcg_subtype') { $valuetoshow = $langs->trans("Pcg_subtype"); }
+			if ($fieldlist[$field] == 'sortorder') { $valuetoshow = $langs->trans("SortOrder"); }
+			if ($fieldlist[$field] == 'short_label') { $valuetoshow = $langs->trans("ShortLabel"); }
+			if ($fieldlist[$field] == 'range_account') { $valuetoshow = $langs->trans("Range"); }
+			if ($fieldlist[$field] == 'sens') { $valuetoshow = $langs->trans("Sens"); }
+			if ($fieldlist[$field] == 'category_type') { $valuetoshow = $langs->trans("Calculated"); }
+			if ($fieldlist[$field] == 'formula') { $valuetoshow = $langs->trans("Formula"); }
+			if ($fieldlist[$field] == 'paper_size') { $valuetoshow = $langs->trans("PaperSize"); }
+			if ($fieldlist[$field] == 'orientation') { $valuetoshow = $langs->trans("Orientation"); }
+			if ($fieldlist[$field] == 'leftmargin') { $valuetoshow = $langs->trans("LeftMargin"); }
+			if ($fieldlist[$field] == 'topmargin') { $valuetoshow = $langs->trans("TopMargin"); }
+			if ($fieldlist[$field] == 'spacex') { $valuetoshow = $langs->trans("SpaceX"); }
+			if ($fieldlist[$field] == 'spacey') { $valuetoshow = $langs->trans("SpaceY"); }
+			if ($fieldlist[$field] == 'font_size') { $valuetoshow = $langs->trans("FontSize"); }
+			if ($fieldlist[$field] == 'custom_x') { $valuetoshow = $langs->trans("CustomX"); }
+			if ($fieldlist[$field] == 'custom_y') { $valuetoshow = $langs->trans("CustomY"); }
+			if ($fieldlist[$field] == 'percent') { $valuetoshow = $langs->trans("Percentage"); }
+			if ($fieldlist[$field] == 'affect') { $valuetoshow = $langs->trans("WithCounter"); }
+			if ($fieldlist[$field] == 'delay') { $valuetoshow = $langs->trans("NoticePeriod"); }
+			if ($fieldlist[$field] == 'newbymonth') { $valuetoshow = $langs->trans("NewByMonth"); }
+			if ($fieldlist[$field] == 'fk_tva') { $valuetoshow = $langs->trans("VAT"); }
+			if ($fieldlist[$field] == 'range_ik') { $valuetoshow = $langs->trans("RangeIk"); }
+			if ($fieldlist[$field] == 'fk_c_exp_tax_cat') { $valuetoshow = $langs->trans("CarCategory"); }
+			if ($fieldlist[$field] == 'revenuestamp_type') { $valuetoshow = $langs->trans('TypeOfRevenueStamp'); }
+			if ($fieldlist[$field] == 'use_default') { $valuetoshow = $langs->trans('Default'); $cssprefix = 'center '; }
+			if ($fieldlist[$field] == 'unit_type') { $valuetoshow = $langs->trans('TypeOfUnit'); }
+
+			if ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') { $showfield = 0; }
+
+			// Show field title
+			if ($showfield)
+			{
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) $newvaluetoshow = '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value])) $newvaluetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				else $newvaluetoshow = $valuetoshow;
+
+				print getTitleFieldOfList($newvaluetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
+			}
+		}
 		// Favorite - Only activated on country dictionary
-        if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+		if ($id == 4) print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
 
 		print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
-        print getTitleFieldOfList('');
-        print getTitleFieldOfList('');
-        print '</tr>';
+		print getTitleFieldOfList('');
+		print getTitleFieldOfList('');
+		print '</tr>';
 
-        if ($num)
-        {
-            // Lines with values
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-                if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-                {
-                    $tmpaction = 'edit';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+		if ($num)
+		{
+			// Lines with values
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				//print_r($obj);
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+				{
+					$tmpaction = 'edit';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('editDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    // Show fields
-                    if (empty($reshook)) {
-                    	$withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit');
-                    }
+					// Show fields
+					if (empty($reshook)) {
+						$withentity = fieldList($fieldlist, $obj, $tabname[$id], 'edit');
+					}
 
-                    print '<td colspan="3" class="center">';
-                    print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
-                    print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
-                    print '<input type="hidden" name="rowid" value="'.dol_escape_htmltag($rowid).'">';
-                    if (!is_null($withentity))
-                    	print '<input type="hidden" name="entity" value="'.$withentity.'">';
-                    print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-                    print '</td>';
-                } else {
-	              	$tmpaction = 'view';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					print '<td colspan="3" class="center">';
+					print '<div name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'"></div>';
+					print '<input type="hidden" name="page" value="'.dol_escape_htmltag($page).'">';
+					print '<input type="hidden" name="rowid" value="'.dol_escape_htmltag($rowid).'">';
+					if (!is_null($withentity))
+						print '<input type="hidden" name="entity" value="'.$withentity.'">';
+					print '<input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+					print '</td>';
+				} else {
+				  	$tmpaction = 'view';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('viewDictionaryFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook))
-                    {
-                    	$withentity = null;
+					if (empty($reshook))
+					{
+						$withentity = null;
 
-                        foreach ($fieldlist as $field => $value)
-                        {
-                        	//var_dump($fieldlist);
-                        	$class = '';
-                        	$showfield = 1;
-                        	$valuetoshow = $obj->{$fieldlist[$field]};
+						foreach ($fieldlist as $field => $value)
+						{
+							//var_dump($fieldlist);
+							$class = '';
+							$showfield = 1;
+							$valuetoshow = $obj->{$fieldlist[$field]};
 
-                        	if ($fieldlist[$field] == 'entity') {
-                        		$withentity = $valuetoshow;
-                        		continue;
-                        	}
+							if ($fieldlist[$field] == 'entity') {
+								$withentity = $valuetoshow;
+								continue;
+							}
 
-                            if ($value == 'element')
-                            {
-                                $valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
-                            } elseif ($value == 'source')
-                            {
-                                $valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
-                            } elseif ($valuetoshow == 'all') {
-                                $valuetoshow = $langs->trans('All');
-                            } elseif ($fieldlist[$field] == 'country') {
-                                if (empty($obj->country_code))
-                                {
-                                    $valuetoshow = '-';
-                                } else {
-                                    $key = $langs->trans("Country".strtoupper($obj->country_code));
-                                    $valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
-                                }
-                            } elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-                                $valuetoshow = yn($valuetoshow);
-                                $class = "center";
-                            } elseif ($fieldlist[$field] == 'type_cdr') {
-                				if (empty($valuetoshow)) $valuetoshow = $langs->trans('None');
-                				elseif ($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
-                				elseif ($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
-                                $class = "center";
-                            } elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
-                                $valuetoshow = price($valuetoshow);
-                            }
-                            if ($value == 'private')
-                            {
-                                $valuetoshow = yn($elementList[$valuetoshow]);
-                            } elseif ($fieldlist[$field] == 'libelle_facture') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentCondition".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                                $valuetoshow = nl2br($valuetoshow);
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
-                                $key = $langs->trans("Country".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
-                                $langs->load("propal");
-                                $key = $langs->trans("AvailabilityType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
-                                $key = $langs->trans("Action".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
-                                $key = $langs->trans("Currency".strtoupper($obj->code_iso));
-                                $valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
-                                $key = $langs->trans("Civility".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
-                            	$langs->load('agenda');
-                                $key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
-                                $langs->load("bills");
-                                $key = $langs->trans("PaymentType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
-                            	$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
-                            	$valuetoshow = $payment_type_list[$valuetoshow];
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
-                                $key = $langs->trans("DemandReasonType".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
-                                $langs->load("orders");
-                                $key = $langs->trans($obj->code);
-                                $valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
-                                $langs->load("sendings");
-                                $key = $langs->trans("SendingMethod".strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
-                            {
-                                $key = $langs->trans('PaperFormat'.strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
-                            {
-                                $langs->load('trips');
-                                $key = $langs->trans(strtoupper($obj->code));
-                                $valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
-                                $showfield = 0;
-                            } elseif ($fieldlist[$field] == 'unicode') {
-                            	$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-                            } elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
-	                            $langs->load("products");
-	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
-	                            $langs->load("products");
-	                            $valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
-                            } elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
-                            {
-                            	$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
-                                $valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
-                            } elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
-							    $class = "center";
+							if ($value == 'element')
+							{
+								$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+							} elseif ($value == 'source')
+							{
+								$valuetoshow = isset($sourceList[$valuetoshow]) ? $sourceList[$valuetoshow] : $valuetoshow;
+							} elseif ($valuetoshow == 'all') {
+								$valuetoshow = $langs->trans('All');
+							} elseif ($fieldlist[$field] == 'country') {
+								if (empty($obj->country_code))
+								{
+									$valuetoshow = '-';
+								} else {
+									$key = $langs->trans("Country".strtoupper($obj->country_code));
+									$valuetoshow = ($key != "Country".strtoupper($obj->country_code) ? $obj->country_code." - ".$key : $obj->country);
+								}
+							} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
+								$valuetoshow = yn($valuetoshow);
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'type_cdr') {
+								if (empty($valuetoshow)) $valuetoshow = $langs->trans('None');
+								elseif ($valuetoshow == 1) $valuetoshow = $langs->trans('AtEndOfMonth');
+								elseif ($valuetoshow == 2) $valuetoshow = $langs->trans('CurrentNext');
+								$class = "center";
+							} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
+								$valuetoshow = price($valuetoshow);
+							}
+							if ($value == 'private')
+							{
+								$valuetoshow = yn($elementList[$valuetoshow]);
+							} elseif ($fieldlist[$field] == 'libelle_facture') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentCondition".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+								$valuetoshow = nl2br($valuetoshow);
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+								$key = $langs->trans("Country".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+								$langs->load("propal");
+								$key = $langs->trans("AvailabilityType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+								$key = $langs->trans("Action".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif (!empty($obj->code_iso) && $fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+								$key = $langs->trans("Currency".strtoupper($obj->code_iso));
+								$valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+								$key = $langs->trans("Civility".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
+								$langs->load('agenda');
+								$key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+								$langs->load("bills");
+								$key = $langs->trans("PaymentType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+								$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
+								$valuetoshow = $payment_type_list[$valuetoshow];
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+								$key = $langs->trans("DemandReasonType".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
+								$langs->load("orders");
+								$key = $langs->trans($obj->code);
+								$valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$fieldlist[$field]};
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
+								$langs->load("sendings");
+								$key = $langs->trans("SendingMethod".strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')
+							{
+								$key = $langs->trans('PaperFormat'.strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees')
+							{
+								$langs->load('trips');
+								$key = $langs->trans(strtoupper($obj->code));
+								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'region_id' || $fieldlist[$field] == 'country_id') {
+								$showfield = 0;
+							} elseif ($fieldlist[$field] == 'unicode') {
+								$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+								$langs->load("products");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'short_label' && $tabname[$_GET["id"]] == MAIN_DB_PREFIX.'c_units') {
+								$langs->load("products");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
+							} elseif (($fieldlist[$field] == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format'))
+							{
+								$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
+								$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$fieldlist[$field]});
+							} elseif ($fieldlist[$field] == 'localtax1' || $fieldlist[$field] == 'localtax2') {
+								$class = "center";
 							} elseif ($fieldlist[$field] == 'localtax1_type') {
-                                if ($obj->localtax1 != 0)
-							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else $valuetoshow = '';
-							    $class = "center";
+								if ($obj->localtax1 != 0)
+									$valuetoshow = $localtax_typeList[$valuetoshow];
+								else $valuetoshow = '';
+								$class = "center";
 							} elseif ($fieldlist[$field] == 'localtax2_type') {
-							    if ($obj->localtax2 != 0)
-							        $valuetoshow = $localtax_typeList[$valuetoshow];
-							    else $valuetoshow = '';
-							    $class = "center";
+								if ($obj->localtax2 != 0)
+									$valuetoshow = $localtax_typeList[$valuetoshow];
+								else $valuetoshow = '';
+								$class = "center";
 							} elseif ($fieldlist[$field] == 'taux') {
-                                $valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
-							    $class = "center";
+								$valuetoshow = price($valuetoshow, 0, $langs, 0, 0);
+								$class = "center";
 							} elseif (in_array($fieldlist[$field], array('recuperableonly'))) {
 								$class = "center";
 							} elseif ($fieldlist[$field] == 'accountancy_code' || $fieldlist[$field] == 'accountancy_code_sell' || $fieldlist[$field] == 'accountancy_code_buy') {
-                                $valuetoshow = length_accountg($valuetoshow);
-                            } elseif ($fieldlist[$field] == 'fk_tva')
+								$valuetoshow = length_accountg($valuetoshow);
+							} elseif ($fieldlist[$field] == 'fk_tva')
 							{
 								foreach ($form->cache_vatrates as $key => $Tab)
 								{
@@ -1603,50 +1633,56 @@ if ($id)
 								$valuetoshow = ($obj->label && $key != strtoupper($obj->label) ? $key : $obj->{$fieldlist[$field]});
 							} elseif ($fieldlist[$field] == 'code' && $id == 3) {
 								$valuetoshow = $obj->state_code;
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
+								$langs->load("products");
+								$valuetoshow = $langs->trans($obj->{$fieldlist[$field]});
 							}
-                            $class .= ($class ? ' ' : '').'tddict';
-                            if ($fieldlist[$field] == 'note' && $id == 10) $class .= ' tdoverflowmax200';
-                            if ($fieldlist[$field] == 'tracking') $class .= ' tdoverflowauto';
-                            if ($fieldlist[$field] == 'position') $class .= ' right';
-                            if ($fieldlist[$field] == 'localtax1_type') $class .= ' nowrap';
-                            if ($fieldlist[$field] == 'localtax2_type') $class .= ' nowrap';
-                            // Show value for field
+							$class .= ($class ? ' ' : '').'tddict';
+							if ($fieldlist[$field] == 'note' && $id == 10) $class .= ' tdoverflowmax200';
+							if ($fieldlist[$field] == 'tracking') $class .= ' tdoverflowauto';
+							if ($fieldlist[$field] == 'position') $class .= ' right';
+							if ($fieldlist[$field] == 'localtax1_type') $class .= ' nowrap';
+							if ($fieldlist[$field] == 'localtax2_type') $class .= ' nowrap';
+							if ($fieldlist[$field] == 'pos') $class .= ' right';
+							if ($fieldlist[$field] == 'use_default') $class .= ' center';
+							// Show value for field
 							if ($showfield) print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
-                        }
-                    }
+						}
+					}
 
-                    // Can an entry be erased or disabled ?
-                    // all true by default
-                    $iserasable = 1;
-                    $canbedisabled = 1;
-                    $canbemodified = 1;
-                    if (isset($obj->code) && $id != 10)
-                    {
-                    	if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
-                    }
+					// Can an entry be erased or disabled ?
+					// all true by default
+					$iserasable = 1;
+					$canbedisabled = 1;
+					$canbemodified = 1;
+					if (isset($obj->code) && $id != 10 && $id != 42)
+					{
+						if (($obj->code == '0' || $obj->code == '' || preg_match('/unknown/i', $obj->code))) { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'RECEP') { $iserasable = 0; $canbedisabled = 0; } elseif ($obj->code == 'EF0') { $iserasable = 0; $canbedisabled = 0; }
+					}
 					if ($id == 25 && in_array($obj->code, array('banner', 'blogpost', 'other', 'page')))
 					{
 						$iserasable = 0; $canbedisabled = 0;
 						if (in_array($obj->code, array('banner'))) $canbedisabled = 1;
 					}
-                    if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable = 0; }
-                    if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled = 0; $canbedisabled = 0; }
-                    $canbemodified = $iserasable;
-                    if ($obj->code == 'RECEP') $canbemodified = 1;
-                    if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified = 1;
+					if (isset($obj->type) && in_array($obj->type, array('system', 'systemauto'))) { $iserasable = 0; }
+					if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO')) || in_array($obj->type, array('systemauto'))) { $canbedisabled = 0; $canbedisabled = 0; }
+					$canbemodified = $iserasable;
 
-                    // Build Url. The table is id=, the id of line is rowid=
-                    $rowidcol = $tabrowid[$id];
-                    // If rowidcol not defined
-                    if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27, 32))) $rowidcol = 'rowid';
-                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol}:(!empty($obj->code) ?urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
-                    if (!empty($param)) $url .= '&'.$param;
-                    if (!is_null($withentity)) $url .= '&entity='.$withentity;
-                    $url .= '&';
+					if ($obj->code == 'RECEP') $canbemodified = 1;
+					if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") $canbemodified = 1;
+
+					// Build Url. The table is id=, the id of line is rowid=
+					$rowidcol = $tabrowid[$id];
+					// If rowidcol not defined
+					if (empty($rowidcol) || in_array($id, array(6, 7, 8, 13, 17, 19, 27, 32))) $rowidcol = 'rowid';
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.((!empty($obj->{$rowidcol}) || $obj->{$rowidcol} == '0') ? $obj->{$rowidcol}:(!empty($obj->code) ?urlencode($obj->code) : '')).'&code='.(!empty($obj->code) ?urlencode($obj->code) : '');
+					if (!empty($param)) $url .= '&'.$param;
+					if (!is_null($withentity)) $url .= '&entity='.$withentity;
+					$url .= '&';
 
 					// Favorite
 					// Only activated on country dictionary
-                    if ($id == 4)
+					if ($id == 4)
 					{
 						print '<td class="nowrap center">';
 						if ($iserasable) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->favorite].'_favorite">'.$actl[$obj->favorite].'</a>';
@@ -1654,98 +1690,98 @@ if ($id)
 						print '</td>';
 					}
 
-                    // Active
-                    print '<td class="nowrap center">';
-                    if ($canbedisabled) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
-                    else {
-                 		if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
-                 		elseif (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
-                  		elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
-                    	else print $langs->trans("AlwaysActive");
-                    }
-                    print "</td>";
+					// Active
+					print '<td class="nowrap center">';
+					if ($canbedisabled) print '<a class="reposition" href="'.$url.'action='.$acts[$obj->active].'">'.$actl[$obj->active].'</a>';
+					else {
+				 		if (in_array($obj->code, array('AC_OTH', 'AC_OTH_AUTO'))) print $langs->trans("AlwaysActive");
+				 		elseif (isset($obj->type) && in_array($obj->type, array('systemauto')) && empty($obj->active)) print $langs->trans("Deprecated");
+				  		elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') print $langs->trans("UsedOnlyWithTypeOption");
+						else print $langs->trans("AlwaysActive");
+					}
+					print "</td>";
 
-                    // Modify link
-                    if ($canbemodified) print '<td align="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
-                    else print '<td>&nbsp;</td>';
+					// Modify link
+					if ($canbemodified) print '<td align="center"><a class="reposition editfielda" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					else print '<td>&nbsp;</td>';
 
-                    // Delete link
-                    if ($iserasable)
-                    {
-                        print '<td class="center">';
-                        if ($user->admin) print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
-                        //else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
-                        print '</td>';
-                    } else print '<td>&nbsp;</td>';
+					// Delete link
+					if ($iserasable)
+					{
+						print '<td class="center">';
+						if ($user->admin) print '<a href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a>';
+						//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
+						print '</td>';
+					} else print '<td>&nbsp;</td>';
 
-                    print "</tr>\n";
-                }
-                $i++;
-            }
-        }
+					print "</tr>\n";
+				}
+				$i++;
+			}
+		}
 
-        print '</table>';
-        print '</div>';
-    } else {
-        dol_print_error($db);
-    }
+		print '</table>';
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
 
-    print '</form>';
+	print '</form>';
 } else {
-    /*
+	/*
      * Show list of dictionary to show
      */
 
-    $lastlineisempty = false;
+	$lastlineisempty = false;
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
-    print '<td>'.$langs->trans("Table").'</td>';
-    print '</tr>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td colspan="2">'.$langs->trans("Dictionary").'</td>';
+	print '<td>'.$langs->trans("Table").'</td>';
+	print '</tr>';
 
-    $showemptyline = '';
-    foreach ($taborder as $i)
-    {
-        if (isset($tabname[$i]) && empty($tabcond[$i])) continue;
+	$showemptyline = '';
+	foreach ($taborder as $i)
+	{
+		if (isset($tabname[$i]) && empty($tabcond[$i])) continue;
 
-        if ($i)
-        {
-        	if ($showemptyline)
-        	{
-        		print '<tr class="oddeven"><td width="50%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
-        		$showemptyline = 0;
-        	}
+		if ($i)
+		{
+			if ($showemptyline)
+			{
+				print '<tr class="oddeven"><td width="50%">&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+				$showemptyline = 0;
+			}
 
 
-            $value = $tabname[$i];
-            print '<tr class="oddeven"><td width="50%">';
-            if (!empty($tabcond[$i]))
-            {
-                print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
-            } else {
-                print $langs->trans($tablib[$i]);
-            }
-            print '</td>';
-            print '<td>';
-            /*if (empty($tabcond[$i]))
+			$value = $tabname[$i];
+			print '<tr class="oddeven"><td width="50%">';
+			if (!empty($tabcond[$i]))
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$i.'">'.$langs->trans($tablib[$i]).'</a>';
+			} else {
+				print $langs->trans($tablib[$i]);
+			}
+			print '</td>';
+			print '<td>';
+			/*if (empty($tabcond[$i]))
              {
              print info_admin($langs->trans("DictionaryDisabledSinceNoModuleNeedIt"),1);
              }*/
-            print '</td>';
-            print '<td>'.$tabname[$i].'</td></tr>';
-            $lastlineisempty = false;
-        } else {
-            if (!$lastlineisempty)
-            {
-                $showemptyline = 1;
-                $lastlineisempty = true;
-            }
-        }
-    }
-    print '</table>';
-    print '</div>';
+			print '</td>';
+			print '<td>'.$tabname[$i].'</td></tr>';
+			$lastlineisempty = false;
+		} else {
+			if (!$lastlineisempty)
+			{
+				$showemptyline = 1;
+				$lastlineisempty = true;
+			}
+		}
+	}
+	print '</table>';
+	print '</div>';
 }
 
 print '<br>';
@@ -1784,14 +1820,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			continue;
 		}
 
-	    if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto')))
-        {
-            $hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'');
-            print '<td>';
-            print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
-            print $langs->trans($hidden);
-            print '</td>';
-        } elseif ($fieldlist[$field] == 'country')
+		if (in_array($fieldlist[$field], array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto')))
+		{
+			$hidden = (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'');
+			print '<td>';
+			print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$hidden.'">';
+			print $langs->trans($hidden);
+			print '</td>';
+		} elseif ($fieldlist[$field] == 'country')
 		{
 			if (in_array('region_id', $fieldlist))
 			{
@@ -1860,8 +1896,8 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print $form->selectarray($fieldlist[$field], $select_list, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'2'));
 			print '</td>';
 		} elseif ($fieldlist[$field] == 'recuperableonly' || $fieldlist[$field] == 'type_cdr' || $fieldlist[$field] == 'deductible' || $fieldlist[$field] == 'category_type') {
-		    if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
-		    else print '<td>';
+			if ($fieldlist[$field] == 'type_cdr') print '<td class="center">';
+			else print '<td>';
 			if ($fieldlist[$field] == 'type_cdr') {
 				print $form->selectarray($fieldlist[$field], array(0=>$langs->trans('None'), 1=>$langs->trans('AtEndOfMonth'), 2=>$langs->trans('CurrentNext')), (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''));
 			} else {
@@ -1875,27 +1911,27 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<input type="text" class="flat" value="'.(isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]} : '').'" size="3" name="'.$fieldlist[$field].'">';
 			print '</td>';
 		} elseif (in_array($fieldlist[$field], array('libelle_facture'))) {
-		    print '<td>';
-		    $transfound = 0;
-		    $transkey = '';
-	        // Special case for labels
-	        if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
-	        {
-	            $langs->load("bills");
-	            $transkey = "PaymentCondition".strtoupper($obj->code);
-    	        if ($langs->trans($transkey) != $transkey)
-                {
-                    $transfound = 1;
-                    print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
-                }
-	        }
-		    if (!$transfound)
-		    {
-		        print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
-		    } else {
-                print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
-            }
-		    print '</td>';
+			print '<td>';
+			$transfound = 0;
+			$transkey = '';
+			// Special case for labels
+			if ($tabname == MAIN_DB_PREFIX.'c_payment_term')
+			{
+				$langs->load("bills");
+				$transkey = "PaymentCondition".strtoupper($obj->code);
+				if ($langs->trans($transkey) != $transkey)
+				{
+					$transfound = 1;
+					print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+				}
+			}
+			if (!$transfound)
+			{
+				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'').'</textarea>';
+			} else {
+				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
+			}
+			print '</td>';
 		} elseif ($fieldlist[$field] == 'price' || preg_match('/^amount/i', $fieldlist[$field])) {
 			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'')).'" name="'.$fieldlist[$field].'"></td>';
 		} elseif ($fieldlist[$field] == 'code' && isset($obj->{$fieldlist[$field]})) {
@@ -1922,12 +1958,12 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			if (!empty($conf->accounting->enabled))
 			{
-			    $fieldname = $fieldlist[$field];
+				$fieldname = $fieldlist[$field];
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
 				print $formaccounting->select_account($accountancy_account, '.'.$fieldlist[$field], 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
 			} else {
-			    $fieldname = $fieldlist[$field];
-			    print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
+				$fieldname = $fieldlist[$field];
+				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$fieldlist[$field].'">';
 			}
 			print '</td>';
 		} elseif ($fieldlist[$field] == 'fk_tva')
@@ -1946,42 +1982,47 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
 		} else {
-            $fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
+			$fieldValue = isset($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:'';
 
 			if ($fieldlist[$field] == 'sortorder')
-            {
-                $fieldlist[$field] = 'position';
-            }
+			{
+				$fieldlist[$field] = 'position';
+			}
 
 			$classtd = ''; $class = '';
 			if ($fieldlist[$field] == 'code') $class = 'maxwidth100';
-			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'sortorder', 'sens', 'category_type'))) $class = 'maxwidth50';
+			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'pos', 'use_default', 'affect', 'delay', 'position', 'sortorder', 'sens', 'category_type'))) {
+				$class = 'maxwidth50 center';
+			}
+			if (in_array($fieldlist[$field], array('use_default'))) {
+				$classtd = 'center';
+			}
 			if (in_array($fieldlist[$field], array('libelle', 'label', 'tracking'))) $class = 'quatrevingtpercent';
 			print '<td class="'.$classtd.'">';
 			$transfound = 0;
-            $transkey = '';
+			$transkey = '';
 			if (in_array($fieldlist[$field], array('label', 'libelle')))		// For label
 			{
-			    // Special case for labels
-			    if ($tabname == MAIN_DB_PREFIX.'c_civility') {
-			        $transkey = "Civility".strtoupper($obj->code);
-			    }
-			    if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
-			        $langs->load("bills");
-			        $transkey = "PaymentConditionShort".strtoupper($obj->code);
-			    }
-			    if ($transkey && $langs->trans($transkey) != $transkey)
-			    {
-			        $transfound = 1;
-			        print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
-			    }
+				// Special case for labels
+				if ($tabname == MAIN_DB_PREFIX.'c_civility') {
+					$transkey = "Civility".strtoupper($obj->code);
+				}
+				if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+					$langs->load("bills");
+					$transkey = "PaymentConditionShort".strtoupper($obj->code);
+				}
+				if ($transkey && $langs->trans($transkey) != $transkey)
+				{
+					$transfound = 1;
+					print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
+				}
 			}
 			if (!$transfound)
 			{
-                print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
+				print '<input type="text" class="flat'.($class ? ' '.$class : '').'" value="'.dol_escape_htmltag($fieldValue).'" name="'.$fieldlist[$field].'">';
 			} else {
-                print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
-            }
+				print '<input type="hidden" name="'.$fieldlist[$field].'" value="'.$transkey.'">';
+			}
 			print '</td>';
 		}
 	}
diff --git a/htdocs/admin/ecm_directories_extrafields.php b/htdocs/admin/ecm_directories_extrafields.php
index 71029c0fc67..77e21963e4c 100644
--- a/htdocs/admin/ecm_directories_extrafields.php
+++ b/htdocs/admin/ecm_directories_extrafields.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'ecm'));
@@ -89,9 +89,9 @@ dol_fiche_end();
 
 // Buttons
 if ($action != 'create' && $action != 'edit') {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -102,9 +102,9 @@ if ($action != 'create' && $action != 'edit') {
 /* ************************************************************************** */
 
 if ($action == 'create') {
-    print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	print '<br><div id="newattrib"></div>';
+	print load_fiche_titre($langs->trans('NewAttribute'));
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -113,9 +113,9 @@ if ($action == 'create') {
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname)) {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/ecm_files_extrafields.php b/htdocs/admin/ecm_files_extrafields.php
index 9d747d4f684..aaa507ca7c4 100644
--- a/htdocs/admin/ecm_files_extrafields.php
+++ b/htdocs/admin/ecm_files_extrafields.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'ecm'));
@@ -89,9 +89,9 @@ dol_fiche_end();
 
 // Buttons
 if ($action != 'create' && $action != 'edit') {
-    print '<div class="tabsAction">';
-    print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -102,9 +102,9 @@ if ($action != 'create' && $action != 'edit') {
 /* ************************************************************************** */
 
 if ($action == 'create') {
-    print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	print '<br><div id="newattrib"></div>';
+	print load_fiche_titre($langs->trans('NewAttribute'));
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -113,9 +113,9 @@ if ($action == 'create') {
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname)) {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index d44f96e0877..98dcfd592a2 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -393,7 +393,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index f220d83ebcd..f7db2a8b4e9 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2001-2005	Rodolphe Quiedeville		<rodolphe@quiedeville.org>
+/* Copyright (C) 2001-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
  * Copyright (C) 2004-2015	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 8971f5a69d4..55316e47332 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -31,6 +31,7 @@ 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', 'aZ09');
 
 if (!$user->admin) accessforbidden();
 
@@ -64,33 +65,46 @@ complete_substitutions_array($substitutionarrayfortest, $langs);
  * Actions
  */
 
-if ($action == 'update' && empty($_POST["cancel"]))
+if ($action == 'update' && !$cancel)
 {
-	dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOST("MAIN_DISABLE_ALL_MAILS", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO", GETPOST("MAIN_MAIL_FORCE_SENDTO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT", GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT", 'int'), 'chaine', 0, '', $conf->entity);
-	// Send mode parameters
-	dolibarr_set_const($db, "MAIN_MAIL_SENDMODE", GETPOST("MAIN_MAIL_SENDMODE", 'aZ09'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity);
+	if (! $error && ! GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml')) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("MAIN_MAIL_EMAIL_FROM")), null, 'errors');
+		$action = 'edit';
+	}
+	if (! $error && ! isValidEmail(GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml'))) {
+		$error++;
+		setEventMessages($langs->trans("ErrorBadEMail", GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml')), null, 'errors');
+		$action = 'edit';
+	}
 
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED", 'int'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN", GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_SELECTOR", GETPOST("MAIN_MAIL_EMAIL_DKIM_SELECTOR", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", GETPOST("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	// Content parameters
-	dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM", GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_ERRORS_TO", GETPOST("MAIN_MAIL_ERRORS_TO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO", GETPOST("MAIN_MAIL_AUTOCOPY_TO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, 'MAIN_MAIL_DEFAULT_FROMTYPE', GETPOST('MAIN_MAIL_DEFAULT_FROMTYPE', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	if (! $error) {
+		dolibarr_set_const($db, "MAIN_DISABLE_ALL_MAILS", GETPOST("MAIN_DISABLE_ALL_MAILS", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_FORCE_SENDTO", GETPOST("MAIN_MAIL_FORCE_SENDTO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_ENABLED_USER_DEST_SELECT", GETPOST("MAIN_MAIL_ENABLED_USER_DEST_SELECT", 'int'), 'chaine', 0, '', $conf->entity);
+		// Send mode parameters
+		dolibarr_set_const($db, "MAIN_MAIL_SENDMODE", GETPOST("MAIN_MAIL_SENDMODE", 'aZ09'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity);
 
-	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
-	exit;
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN", GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_SELECTOR", GETPOST("MAIN_MAIL_EMAIL_DKIM_SELECTOR", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", GETPOST("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		// Content parameters
+		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM", GETPOST("MAIN_MAIL_EMAIL_FROM", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_ERRORS_TO", GETPOST("MAIN_MAIL_ERRORS_TO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_MAIL_AUTOCOPY_TO", GETPOST("MAIN_MAIL_AUTOCOPY_TO", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, 'MAIN_MAIL_DEFAULT_FROMTYPE', GETPOST('MAIN_MAIL_DEFAULT_FROMTYPE', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+
+		header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup");
+		exit;
+	}
 }
 
 
@@ -462,8 +476,8 @@ if ($action == 'edit')
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("OtherOptions").'</td><td></td></tr>';
 
 	// From
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
-	print '<td><input class="flat" name="MAIN_MAIL_EMAIL_FROM" size="32" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? $conf->global->MAIN_MAIL_EMAIL_FROM : '');
+	print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ?ini_get('sendmail_from') : $langs->transnoentities("Undefined")).'</td>';
+	print '<td><input class="flat minwidth200" name="MAIN_MAIL_EMAIL_FROM" value="'.(!empty($conf->global->MAIN_MAIL_EMAIL_FROM) ? $conf->global->MAIN_MAIL_EMAIL_FROM : '');
 	print '"></td></tr>';
 
 	// Default from type
@@ -538,7 +552,7 @@ if ($action == 'edit')
 	print $text;
 
 	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
-		print $form->textwithpicto('', $langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC"), 1, 'warning');
+		print $form->textwithpicto('', $langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC").'<br><br>'.$langs->trans("WarningPHPMailD"), 1, 'warning');
 	}
 
 	print '</td></tr>';
@@ -637,7 +651,7 @@ if ($action == 'edit')
 	print '</table>';
 
 	if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP)) {
-		print info_admin($langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC"), 0, 0, 'warning');
+		print info_admin($langs->trans("WarningPHPMail").'<br>'.$langs->trans("WarningPHPMailA").'<br>'.$langs->trans("WarningPHPMailB").'<br>'.$langs->trans("WarningPHPMailC").'<br><br>'.$langs->trans("WarningPHPMailD"), 0, 0, 'warning');
 	}
 
 	print '<br>';
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index 16ae12ffcc5..b9299a5c58b 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -474,7 +474,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index 1158ee56655..b9281765771 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -147,29 +147,30 @@ $tabfieldcheck = array();
 $tabfieldcheck[25] = array();
 
 
-// Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
-$sourceList = array();
 
 // We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
 $elementList = array();
-if ($conf->propal->enabled && $user->rights->propal->lire)     $elementList['propal_send'] = $langs->trans('MailToSendProposal');
-if ($conf->commande->enabled && $user->rights->commande->lire) $elementList['order_send'] = $langs->trans('MailToSendOrder');
-if ($conf->facture->enabled && $user->rights->facture->lire)   $elementList['facture_send'] = $langs->trans('MailToSendInvoice');
-if ($conf->expedition->enabled)        $elementList['shipping_send'] = $langs->trans('MailToSendShipment');
-if ($conf->reception->enabled) 		   $elementList['reception_send'] = $langs->trans('MailToSendReception');
-if ($conf->ficheinter->enabled)        $elementList['fichinter_send'] = $langs->trans('MailToSendIntervention');
-if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send'] = $langs->trans('MailToSendSupplierRequestForQuotation');
-if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_order->enabled && $user->rights->supplier_order->lire))	$elementList['order_supplier_send'] = $langs->trans('MailToSendSupplierOrder');
-if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_invoice->enabled && $user->rights->supplier_invoice->lire))	$elementList['invoice_supplier_send'] = $langs->trans('MailToSendSupplierInvoice');
-if ($conf->societe->enabled && $user->rights->societe->lire)           $elementList['thirdparty'] = $langs->trans('MailToThirdparty');
-if ($conf->adherent->enabled && $user->rights->adherent->lire)          $elementList['member'] = $langs->trans('MailToMember');
-if ($conf->contrat->enabled && $user->rights->contrat->lire)           $elementList['contract'] = $langs->trans('MailToSendContract');
-if ($conf->projet->enabled)            $elementList['project'] = $langs->trans('MailToProject');
-if ($conf->ticket->enabled && $user->rights->ticket->read)            $elementList['ticket_send'] = $langs->trans('MailToTicket');
-if ($conf->recruitment->enabled && $user->rights->recruitment->recruitmentjobposition->read)            $elementList['recruitmentcandidature_send'] = $langs->trans('RecruitmentCandidatures');
-if ($conf->agenda->enabled)            $elementList['actioncomm_send'] = $langs->trans('MailToSendEventPush');
-$elementList['user'] = $langs->trans('MailToUser');
+// Add all and none after the sort
+$elementList['all'] = '-- '.dol_escape_htmltag($langs->trans("All")).' --';
+$elementList['none'] = '-- '.dol_escape_htmltag($langs->trans("None")).' --';
+$elementList['user'] = img_picto('', 'user', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToUser'));
+if ($conf->adherent->enabled && $user->rights->adherent->lire)          $elementList['member'] = img_picto('', 'object_member', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToMember'));
+if ($conf->recruitment->enabled && $user->rights->recruitment->recruitmentjobposition->read)            $elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="paddingright"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
+if ($conf->societe->enabled && $user->rights->societe->lire)           $elementList['thirdparty'] = img_picto('', 'company', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
+if ($conf->projet->enabled)            $elementList['project'] = img_picto('', 'project', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToProject'));
+if ($conf->propal->enabled && $user->rights->propal->lire)     $elementList['propal_send'] = dol_escape_htmltag($langs->trans('MailToSendProposal'));
+if ($conf->commande->enabled && $user->rights->commande->lire) $elementList['order_send'] = dol_escape_htmltag($langs->trans('MailToSendOrder'));
+if ($conf->facture->enabled && $user->rights->facture->lire)   $elementList['facture_send'] = dol_escape_htmltag($langs->trans('MailToSendInvoice'));
+if ($conf->expedition->enabled)        $elementList['shipping_send'] = dol_escape_htmltag($langs->trans('MailToSendShipment'));
+if ($conf->reception->enabled) 		   $elementList['reception_send'] = dol_escape_htmltag($langs->trans('MailToSendReception'));
+if ($conf->ficheinter->enabled)        $elementList['fichinter_send'] = dol_escape_htmltag($langs->trans('MailToSendIntervention'));
+if ($conf->supplier_proposal->enabled) $elementList['supplier_proposal_send'] = dol_escape_htmltag($langs->trans('MailToSendSupplierRequestForQuotation'));
+if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_order->enabled && $user->rights->supplier_order->lire))	$elementList['order_supplier_send'] = dol_escape_htmltag($langs->trans('MailToSendSupplierOrder'));
+if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || ($conf->supplier_invoice->enabled && $user->rights->supplier_invoice->lire))	$elementList['invoice_supplier_send'] = dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
+if ($conf->contrat->enabled && $user->rights->contrat->lire)           $elementList['contract'] = img_picto('', 'contract', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendContract'));
+if ($conf->ticket->enabled && $user->rights->ticket->read)            $elementList['ticket_send'] = img_picto('', 'ticket', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToTicket'));
+if ($conf->agenda->enabled)            $elementList['actioncomm_send'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventPush'));
 
 $parameters = array('elementList'=>$elementList);
 $reshook = $hookmanager->executeHooks('emailElementlist', $parameters); // Note that $action and $object may have been modified by some hooks
@@ -179,11 +180,7 @@ if ($reshook == 0) {
 	}
 }
 
-// Add all and none after the sort
-$elementList['all'] = '-- '.$langs->trans("All").' -- ('.$langs->trans('VisibleEverywhere').')';
-$elementList['none'] = '-- '.$langs->trans("None").' -- ('.$langs->trans('VisibleNowhere').')';
-
-asort($elementList);
+//asort($elementList);
 
 $id = 25;
 
@@ -303,7 +300,7 @@ if (empty($reshook))
 			}
 		}
 
-		// Si verif ok et action modify, on modifie la ligne
+		// We modify the line
 		if ($ok && GETPOST('actionmodify'))
 		{
 			$rowidcol = "rowid";
@@ -414,7 +411,7 @@ $formadmin = new FormAdmin($db);
 $help_url = '';
 $title = $langs->trans("EMailsSetup");
 
-llxHeader('', $title);
+llxHeader('', $title, $help_url);
 
 $linkback = '';
 $titlepicto = 'title_setup';
@@ -430,10 +427,9 @@ if ($action == 'delete')
 {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
-//var_dump($elementList);
 
 
-$sql = "SELECT rowid as rowid, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
+$sql = "SELECT rowid as rowid, module, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates";
 $sql .= " WHERE entity IN (".getEntity('email_template').")";
 if (!$user->admin)
@@ -481,7 +477,7 @@ if ($action == 'view') {
 		if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
 		if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
 		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') { $valuetoshow = $langs->trans("Code"); }
-		if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); }
+		if ($fieldlist[$field] == 'type_template') { $valuetoshow = $langs->trans("TypeOfTemplate"); $align="center"; }
 		if ($fieldlist[$field] == 'private') { $align = 'center'; }
 		if ($fieldlist[$field] == 'position') { $align = 'center'; }
 
@@ -492,7 +488,7 @@ if ($action == 'view') {
 
 		if ($valuetoshow != '')
 		{
-			print '<td align="'.$align.'">';
+			print '<td class="'.$align.'">';
 			if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 			elseif (!empty($tabhelp[$id][$value]))
 			{
@@ -570,14 +566,12 @@ if ($action == 'view') {
 		} elseif ($tmpfieldlist == 'joinfiles') {
 			print '<input type="text" class="flat maxwidth50" name="'.$tmpfieldlist.'" value="'.(isset($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : '1').'">';
 		} else {
-			if ($context != 'hide') {
-				// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
-				$okforextended = true;
-				if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
-				$okforextended = false;
-				$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
-				print $doleditor->Create(1);
-			} else print '&nbsp;';
+			// print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
+			$okforextended = true;
+			if (empty($conf->global->FCKEDITOR_ENABLE_MAIL))
+			$okforextended = false;
+			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 180, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
+			print $doleditor->Create(1);
 		}
 		print '</td>';
 		if ($tmpfieldlist == 'topic') {
@@ -591,11 +585,6 @@ if ($action == 'view') {
 		print '</tr>';
 	}
 
-
-
-	$colspan = count($fieldlist) + 1;
-	//print '<tr><td colspan="'.$colspan.'">&nbsp;</td></tr>';  // Keep &nbsp; to have a line with enough height
-
 	print '</table>';
 	print '</div>';
 	print '</form>';
@@ -641,26 +630,24 @@ if ($resql)
 	// Title line with search boxes
 	print '<tr class="liste_titre">';
 
-	$filterfound = 0;
 	foreach ($fieldlist as $field => $value)
 	{
 		if ($value == 'label') {
 			print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth200" value="'.dol_escape_htmltag($search_label).'"></td>';
 		} elseif ($value == 'lang') {
 			print '<td class="liste_titre">';
-			print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth100');
+			print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
 			print '</td>';
 		} elseif ($value == 'fk_user') {
 			print '<td class="liste_titre">';
-			$restrictid = array();
-			if (!$user->admin) $restrictid = array($user->id);
-			//var_dump($restrictid);
-			print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, 'hierarchyme', null, 0, 0, 1, '', 0, '', 'maxwidth100');
+			print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 1, '', 0, '', 'maxwidth150');
 			print '</td>';
 		} elseif ($value == 'topic') {
 			print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
 		} elseif ($value == 'type_template') {
-			print '<td class="liste_titre">'.$form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100 maxwidth100onsmartphone').'</td>';
+			print '<td class="liste_titre center">';
+			print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1, '', 0, 1);
+			print '</td>';
 		} elseif (!in_array($value, array('content', 'content_lines'))) {
 			print '<td class="liste_titre"></td>';
 		}
@@ -792,6 +779,13 @@ if ($resql)
 
 				print "</tr>\n";
 			} else {
+			    if ($obj->module) {
+			        $tempmodulekey = $obj->module;
+			        if (empty($conf->$tempmodulekey) || empty($conf->$tempmodulekey->enabled)) {
+			            $i++;
+			            continue;
+			        }
+			    }
 				$keyforobj = 'type_template';
 				if (!in_array($obj->$keyforobj, array_keys($elementList)))
 				{
@@ -819,22 +813,26 @@ if ($resql)
 					{
 						if (in_array($fieldlist[$field], array('content', 'content_lines'))) continue;
 						$showfield = 1;
-						$align = "left";
+						$align = "";
+						$class = "tddict";
 						$valuetoshow = $obj->{$fieldlist[$field]};
-						if ($value == 'label' || $value == 'topic')
-						{
+						if ($value == 'label' || $value == 'topic') {
 							$valuetoshow = dol_escape_htmltag($valuetoshow);
 						}
-						if ($value == 'type_template')
-						{
-							$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+						if ($value == 'label') {
+							$class .= ' tdoverflowmax100';
 						}
-						if ($value == 'lang' && $valuetoshow)
-						{
+						/*if ($value == 'topic') {
+							$class .= ' tdoverflowmax300';
+						}*/
+						if ($value == 'type_template') {
+							$valuetoshow = isset($elementList[$valuetoshow]) ? $elementList[$valuetoshow] : $valuetoshow;
+							$align = "center";
+						}
+						if ($value == 'lang' && $valuetoshow) {
 							$valuetoshow = $valuetoshow.' - '.$langs->trans("Language_".$valuetoshow);
 						}
-						if ($value == 'fk_user')
-						{
+						if ($value == 'fk_user') {
 							if ($valuetoshow > 0)
 							{
 								$fuser = new User($db);
@@ -842,29 +840,25 @@ if ($resql)
 								$valuetoshow = $fuser->getNomUrl(1);
 							}
 						}
-						if ($value == 'private')
-						{
+						if ($value == 'private') {
 							$align = "center";
 							if ($valuetoshow) $valuetoshow = yn($valuetoshow);
 							else $valuetoshow = '';
 						}
-						if ($value == 'position')
-						{
+						if ($value == 'position') {
 							$align = "center";
 						}
-						if ($value == 'joinfiles')
-						{
+						if ($value == 'joinfiles') {
 							$align = "center";
 							if ($valuetoshow) $valuetoshow = 1;
 							else $valuetoshow = '';
 						}
+						if ($align) $class .= ' '.$align;
 
-						$class = 'tddict';
 						// Show value for field
-						if ($showfield)
-						{
+						if ($showfield) {
 						   	print '<!-- '.$fieldlist[$field].' -->';
-						   	print '<td align="'.$align.'" class="'.$class.'">'.$valuetoshow.'</td>';
+						   	print '<td class="'.$class.'">'.$valuetoshow.'</td>';
 						}
 					}
 				}
@@ -963,7 +957,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 {
 	global $conf, $langs, $user, $db;
 	global $form;
-	global $elementList, $sourceList;
+	global $elementList;
 
 	$formadmin = new FormAdmin($db);
 
@@ -972,9 +966,8 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		if ($fieldlist[$field] == 'fk_user')
 		{
 			print '<td>';
-			if ($user->admin)
-			{
-				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, '', null, 0, 0, 1, '', 0, '', 'maxwidth200');
+			if ($user->admin) {
+				print $form->select_dolusers($obj->{$fieldlist[$field]}, 'fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 1, '', 0, '', 'maxwidth200');
 			} else {
 				if ($context == 'add')	// I am not admin and we show the add form
 				{
@@ -1017,14 +1010,14 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		// Le type de template
 		elseif ($fieldlist[$field] == 'type_template')
 		{
-			print '<td>';
+			print '<td class="center">';
 			if ($context == 'edit' && !empty($obj->{$fieldlist[$field]}) && !in_array($obj->{$fieldlist[$field]}, array_keys($elementList)))
 			{
 				// Current tempalte type is an unknown type, so we must keep it as it is.
 				print '<input type="hidden" name="type_template" value="'.$obj->{$fieldlist[$field]}.'">';
 				print $obj->{$fieldlist[$field]};
 			} else {
-				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150 maxwidth100onsmartphone');
+				print $form->selectarray('type_template', $elementList, (!empty($obj->{$fieldlist[$field]}) ? $obj->{$fieldlist[$field]}:''), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth150', 1, '', 0, 1);
 			}
 			print '</td>';
 		} elseif ($context == 'add' && in_array($fieldlist[$field], array('topic', 'joinfiles', 'content', 'content_lines'))) continue;
diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index b7b0060c778..f83507c37aa 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -330,10 +330,10 @@ if ($conf->use_javascript_ajax)
 			$entry .= '</td></tr></table>';
 
 			$buttons = '<a class="editfielda marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=edit&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit('default', 0, 'class="menuEdit" id="edit'.$menu['rowid'].'"').'</a> ';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
-			$buttons .=	'&nbsp; &nbsp; &nbsp;';
-			$buttons .=	'<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="edit.php?menu_handler='.$menu_handler_to_search.'&action=create&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_edit_add('default').'</a> ';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=delete&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_delete('default').'</a> ';
+			$buttons .= '&nbsp; &nbsp; &nbsp;';
+			$buttons .= '<a class="marginleftonly marginrightonly" href="index.php?menu_handler='.$menu_handler_to_search.'&action=up&token='.newToken().'&menuId='.$menu['rowid'].'">'.img_picto("Up", "1uparrow").'</a><a href="index.php?menu_handler='.$menu_handler_to_search.'&action=down&menuId='.$menu['rowid'].'">'.img_picto("Down", "1downarrow").'</a>';
 
 			$data[] = array(
 				'rowid'=>$menu['rowid'],
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index c61e352aad8..8010acd8e84 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -28,6 +28,8 @@
  *  \brief      Page to activate/disable all modules
  */
 
+if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -662,9 +664,9 @@ if ($mode == 'common' || $mode == 'commonkanban')
 		// Version (with picto warning or not)
 		$version = $objMod->getVersion(0);
 		$versiontrans = '';
-		if (preg_match('/development/i', $version))  $versiontrans .= img_warning($langs->trans("Development"), 'style="float: left"');
-		if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), 'style="float: left"');
-		if (preg_match('/deprecated/i', $version))   $versiontrans .= img_warning($langs->trans("Deprecated"), 'style="float: left"');
+		if (preg_match('/development/i', $version))  $versiontrans .= img_warning($langs->trans("Development"), '', 'floatleft paddingright');
+		if (preg_match('/experimental/i', $version)) $versiontrans .= img_warning($langs->trans("Experimental"), '', 'floatleft paddingright');
+		if (preg_match('/deprecated/i', $version))   $versiontrans .= img_warning($langs->trans("Deprecated"), '', 'floatleft paddingright');
 		if ($objMod->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
 			$versiontrans .= $objMod->getVersion(1);
 		}
@@ -701,11 +703,11 @@ if ($mode == 'common' || $mode == 'commonkanban')
 				if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
 			} else {
 				if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
-					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
+					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset_confirm&amp;confirm_message_code='.$objMod->warnings_unactivation[$mysoc->country_code].'&amp;value='.$modName.'&amp;mode='.$mode.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
 				} else {
-					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
+					$codeenabledisable .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;token='.newToken().'&amp;module_position='.$module_position.'&amp;action=reset&amp;value='.$modName.'&amp;mode='.$mode.'&amp;confirm=yes'.$param.'">';
 					$codeenabledisable .= img_picto($langs->trans("Activated"), 'switch_on');
 					$codeenabledisable .= '</a>';
 				}
@@ -1151,8 +1153,6 @@ if ($mode == 'develop')
 
 	print '<tr class="oddeven" height="80">'."\n";
 	print '<td class="left">';
-	//span class="fa fa-bug"></span>
-	//print '<img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolibarr_preferred_partner.png">';
 	print '<div class="imgmaxheight50 logo_setup"></div>';
 	print '</td>';
 	print '<td>'.$langs->trans("TryToUseTheModuleBuilder", $langs->transnoentitiesnoconv("ModuleBuilder")).'</td>';
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 2d843a52577..2c8f2070724 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -58,50 +58,50 @@ if (!$mode) $mode = 'setup';
 
 if ($action == 'setconst' && $user->admin)
 {
-    $error = 0;
-    $db->begin();
+	$error = 0;
+	$db->begin();
 
-    $setupconstarray = GETPOST('setupdriver', 'array');
+	$setupconstarray = GETPOST('setupdriver', 'array');
 
-    foreach ($setupconstarray as $setupconst) {
-        //print '<pre>'.print_r($setupconst, true).'</pre>';
+	foreach ($setupconstarray as $setupconst) {
+		//print '<pre>'.print_r($setupconst, true).'</pre>';
 
-    	$constname = dol_escape_htmltag($setupconst['varname']);
-    	$constvalue = dol_escape_htmltag($setupconst['value']);
-    	$consttype = dol_escape_htmltag($setupconst['type']);
-    	$constnote = dol_escape_htmltag($setupconst['note']);
+		$constname = dol_escape_htmltag($setupconst['varname']);
+		$constvalue = dol_escape_htmltag($setupconst['value']);
+		$consttype = dol_escape_htmltag($setupconst['type']);
+		$constnote = dol_escape_htmltag($setupconst['note']);
 
-    	$result = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
-        if (!$result > 0) $error++;
-    }
+		$result = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
+		if (!$result > 0) $error++;
+	}
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 if ($action == 'setvalue' && $user->admin)
 {
-    $db->begin();
+	$db->begin();
 
-    $result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
-    if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
 
-    if (!$error)
-    {
-        $db->commit();
-        setEventMessages($langs->trans("SetupSaved"), null);
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
-    $action = '';
+	if (!$error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null);
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
+	$action = '';
 }
 
 
@@ -131,275 +131,275 @@ if (GETPOST('error')) {
 
 if ($mode == 'setup' && $user->admin)
 {
-    print '<span class="opacitymedium">'.$langs->trans("OAuthSetupForLogin")."</span><br><br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("OAuthSetupForLogin")."</span><br><br>\n";
 
-    foreach ($list as $key)
-    {
-        $supported = 0;
-        if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
-        if (!$supported) continue; // show only supported
+	foreach ($list as $key)
+	{
+		$supported = 0;
+		if (in_array($key[0], array_keys($supportedoauth2array))) $supported = 1;
+		if (!$supported) continue; // show only supported
 
 
-        $OAUTH_SERVICENAME = 'Unknown';
-        if ($key[0] == 'OAUTH_GITHUB_NAME')
-        {
-            $OAUTH_SERVICENAME = 'GitHub';
-            // List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
-            // We pass this param list in to 'state' because we need it before and after the redirect.
-            $shortscope = 'user,public_repo';
-            $urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltocheckperms = 'https://github.com/settings/applications/';
-        } elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
-        {
-            $OAUTH_SERVICENAME = 'Google';
-            // List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
-            // We pass this param list in to 'state' because we need it before and after the redirect.
-            $shortscope = 'userinfo_email,userinfo_profile,cloud_print';
-            if (!empty($conf->global->OAUTH_GSUITE)){
-            	$shortscope .= ',admin_directory_user';
+		$OAUTH_SERVICENAME = 'Unknown';
+		if ($key[0] == 'OAUTH_GITHUB_NAME')
+		{
+			$OAUTH_SERVICENAME = 'GitHub';
+			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
+			// We pass this param list in to 'state' because we need it before and after the redirect.
+			$shortscope = 'user,public_repo';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltocheckperms = 'https://github.com/settings/applications/';
+		} elseif ($key[0] == 'OAUTH_GOOGLE_NAME')
+		{
+			$OAUTH_SERVICENAME = 'Google';
+			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
+			// We pass this param list in to 'state' because we need it before and after the redirect.
+			$shortscope = 'userinfo_email,userinfo_profile,cloud_print';
+			if (!empty($conf->global->OAUTH_GSUITE)){
+				$shortscope .= ',admin_directory_user';
 			}
-            //$scope.=',gmail_full';
-            $urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-            $urltocheckperms = 'https://security.google.com/settings/security/permissions';
-        } elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
-        {
-        	$OAUTH_SERVICENAME = 'StripeTest';
-        	$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-        	$urltodelete = '';
-        	$urltocheckperms = '';
-        } elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
-        {
-        	$OAUTH_SERVICENAME = 'StripeLive';
-        	$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
-        	$urltodelete = '';
-        	$urltocheckperms = '';
-        } else {
+			//$scope.=',gmail_full';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltocheckperms = 'https://security.google.com/settings/security/permissions';
+		} elseif ($key[0] == 'OAUTH_STRIPE_TEST_NAME')
+		{
+			$OAUTH_SERVICENAME = 'StripeTest';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = '';
+			$urltocheckperms = '';
+		} elseif ($key[0] == 'OAUTH_STRIPE_LIVE_NAME')
+		{
+			$OAUTH_SERVICENAME = 'StripeLive';
+			$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = '';
+			$urltocheckperms = '';
+		} else {
 			$urltorenew = '';
 			$urltodelete = '';
 			$urltocheckperms = '';
 		}
 
 
-        // Show value of token
-        $tokenobj = null;
-        // Token
-        require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
-        require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
-        // Dolibarr storage
-        $storage = new DoliStorage($db, $conf);
-        try {
-            $tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
-        } catch (Exception $e)
-        {
-            // Return an error if token not found
-        }
+		// Show value of token
+		$tokenobj = null;
+		// Token
+		require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+		require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+		// Dolibarr storage
+		$storage = new DoliStorage($db, $conf);
+		try {
+			$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
+		} catch (Exception $e)
+		{
+			// Return an error if token not found
+		}
 
-        // Set other properties
-        $refreshtoken = false;
-        $expiredat = '';
+		// Set other properties
+		$refreshtoken = false;
+		$expiredat = '';
 
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if (is_object($tokenobj)) {
-            $expire = ($tokenobj->getEndOfLife() !== $tokenobj::EOL_NEVER_EXPIRES && $tokenobj->getEndOfLife() !== $tokenobj::EOL_UNKNOWN && time() > ($tokenobj->getEndOfLife() - 30));
-        }
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if (is_object($tokenobj)) {
+			$expire = ($tokenobj->getEndOfLife() !== $tokenobj::EOL_NEVER_EXPIRES && $tokenobj->getEndOfLife() !== $tokenobj::EOL_UNKNOWN && time() > ($tokenobj->getEndOfLife() - 30));
+		}
 
-        if ($key[1] != '' && $key[2] != '') {
-            if (is_object($tokenobj)) {
-                $refreshtoken = $tokenobj->getRefreshToken();
+		if ($key[1] != '' && $key[2] != '') {
+			if (is_object($tokenobj)) {
+				$refreshtoken = $tokenobj->getRefreshToken();
 
-                $endoflife = $tokenobj->getEndOfLife();
-                if ($endoflife == $tokenobj::EOL_NEVER_EXPIRES)
-                {
-                    $expiredat = $langs->trans("Never");
-                } elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
-                {
-                    $expiredat = $langs->trans("Unknown");
-                } else {
-                    $expiredat = dol_print_date($endoflife, "dayhour");
-                }
-            }
-        }
+				$endoflife = $tokenobj->getEndOfLife();
+				if ($endoflife == $tokenobj::EOL_NEVER_EXPIRES)
+				{
+					$expiredat = $langs->trans("Never");
+				} elseif ($endoflife == $tokenobj::EOL_UNKNOWN)
+				{
+					$expiredat = $langs->trans("Unknown");
+				} else {
+					$expiredat = dol_print_date($endoflife, "dayhour");
+				}
+			}
+		}
 
-        $submit_enabled = 0;
+		$submit_enabled = 0;
 
-        print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="setconst">';
+		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=setup&amp;driver='.$driver.'" autocomplete="off">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="setconst">';
 
 
-        print '<table class="noborder centpercent">'."\n";
+		print '<table class="noborder centpercent">'."\n";
 
-        print '<tr class="liste_titre">';
-        print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
-        print '<th></th>';
-        print '<th></th>';
-        print "</tr>\n";
+		print '<tr class="liste_titre">';
+		print '<th class="titlefieldcreate">'.$langs->trans($key[0]).'</th>';
+		print '<th></th>';
+		print '<th></th>';
+		print "</tr>\n";
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("OAuthIDSecret").'</td>';
-        print '<td>';
-        print $langs->trans("SeePreviousTab");
-        print '</td>';
-        print '<td>';
-        print '</td>';
-        print '</tr>'."\n";
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("OAuthIDSecret").'</td>';
+		print '<td>';
+		print $langs->trans("SeePreviousTab");
+		print '</td>';
+		print '<td>';
+		print '</td>';
+		print '</tr>'."\n";
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("IsTokenGenerated");
-        print '</td>';
-        print '<td>';
-        if (is_object($tokenobj)) print $langs->trans("HasAccessToken");
-        else print $langs->trans("NoAccessToken");
-        print '</td>';
-        print '<td>';
-        // Links to delete/checks token
-        if (is_object($tokenobj))
-        {
-            //test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
-            print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
-        }
-        // Request remote token
-        if ($urltorenew)
-        {
-        	print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
-        }
-        // Check remote access
-        if ($urltocheckperms)
-        {
-            print '<br>'.$langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME).': <a href="'.$urltocheckperms.'" target="_'.strtolower($OAUTH_SERVICENAME).'">'.$urltocheckperms.'</a>';
-        }
-        print '</td>';
-        print '</tr>';
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("IsTokenGenerated");
+		print '</td>';
+		print '<td>';
+		if (is_object($tokenobj)) print $langs->trans("HasAccessToken");
+		else print $langs->trans("NoAccessToken");
+		print '</td>';
+		print '<td>';
+		// Links to delete/checks token
+		if (is_object($tokenobj))
+		{
+			//test on $storage->hasAccessToken($OAUTH_SERVICENAME) ?
+			print '<a class="button" href="'.$urltodelete.'">'.$langs->trans('DeleteAccess').'</a><br>';
+		}
+		// Request remote token
+		if ($urltorenew)
+		{
+			print '<a class="button" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
+		}
+		// Check remote access
+		if ($urltocheckperms)
+		{
+			print '<br>'.$langs->trans("ToCheckDeleteTokenOnProvider", $OAUTH_SERVICENAME).': <a href="'.$urltocheckperms.'" target="_'.strtolower($OAUTH_SERVICENAME).'">'.$urltocheckperms.'</a>';
+		}
+		print '</td>';
+		print '</tr>';
 
-        print '<tr class="oddeven">';
-        print '<td'.($key['required'] ? ' class="required"' : '').'>';
-        //var_dump($key);
-        print $langs->trans("Token").'</td>';
-        print '<td colspan="2">';
-        if (is_object($tokenobj))
-        {
-            //var_dump($tokenobj);
-            print $tokenobj->getAccessToken().'<br>';
-            //print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
-            //print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
-            //var_dump($tokenobj->getExtraParams());
-            /*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
+		print '<tr class="oddeven">';
+		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		//var_dump($key);
+		print $langs->trans("Token").'</td>';
+		print '<td colspan="2">';
+		if (is_object($tokenobj))
+		{
+			//var_dump($tokenobj);
+			print $tokenobj->getAccessToken().'<br>';
+			//print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
+			//print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
+			//var_dump($tokenobj->getExtraParams());
+			/*print '<br>Extra: <br><textarea class="quatrevingtpercent">';
             print ''.join(',',$tokenobj->getExtraParams());
             print '</textarea>';*/
-        }
-        print '</td>';
-        print '</tr>'."\n";
+		}
+		print '</td>';
+		print '</tr>'."\n";
 
-        if (is_object($tokenobj))
-        {
-            // Token refresh
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_REFRESH").'</td>';
-            print '<td colspan="2">';
-            print yn($refreshtoken);
-            print '</td>';
-            print '</tr>';
+		if (is_object($tokenobj))
+		{
+			// Token refresh
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_REFRESH").'</td>';
+			print '<td colspan="2">';
+			print yn($refreshtoken);
+			print '</td>';
+			print '</tr>';
 
-            // Token expired
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_EXPIRED").'</td>';
-            print '<td colspan="2">';
-            print yn($expire);
-            print '</td>';
-            print '</tr>';
+			// Token expired
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_EXPIRED").'</td>';
+			print '<td colspan="2">';
+			print yn($expire);
+			print '</td>';
+			print '</tr>';
 
-            // Token expired at
-            print '<tr class="oddeven">';
-            print '<td'.($key['required'] ? ' class="required"' : '').'>';
-            //var_dump($key);
-            print $langs->trans("TOKEN_EXPIRE_AT").'</td>';
-            print '<td colspan="2">';
-            print $expiredat;
-            print '</td>';
-            print '</tr>';
-        }
+			// Token expired at
+			print '<tr class="oddeven">';
+			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			//var_dump($key);
+			print $langs->trans("TOKEN_EXPIRE_AT").'</td>';
+			print '<td colspan="2">';
+			print $expiredat;
+			print '</td>';
+			print '</tr>';
+		}
 
-        print '</table>';
+		print '</table>';
 
-        if (!empty($driver))
-        {
-            if ($submit_enabled) {
-                print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
-            }
-        }
+		if (!empty($driver))
+		{
+			if ($submit_enabled) {
+				print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Modify")).'"></div>';
+			}
+		}
 
 
-        print '</form>';
-    }
+		print '</form>';
+	}
 }
 
 if ($mode == 'test' && $user->admin)
 {
-    print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintTestDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    if (!empty($driver))
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-        $classname = 'printing_'.$driver;
-        $langs->load($driver);
-        $printer = new $classname($db);
-        //print '<pre>'.print_r($printer, true).'</pre>';
-        if (count($printer->getlistAvailablePrinters())) {
-            if ($printer->listAvailablePrinters() == 0) {
-                print $printer->resprint;
-            } else {
-                setEventMessages($printer->error, $printer->errors, 'errors');
-            }
-        } else {
-            print $langs->trans('PleaseConfigureDriverfromList');
-        }
-    }
+	print '<table class="noborder centpercent">';
+	if (!empty($driver))
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
+		$classname = 'printing_'.$driver;
+		$langs->load($driver);
+		$printer = new $classname($db);
+		//print '<pre>'.print_r($printer, true).'</pre>';
+		if (count($printer->getlistAvailablePrinters())) {
+			if ($printer->listAvailablePrinters() == 0) {
+				print $printer->resprint;
+			} else {
+				setEventMessages($printer->error, $printer->errors, 'errors');
+			}
+		} else {
+			print $langs->trans('PleaseConfigureDriverfromList');
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 }
 
 if ($mode == 'userconf' && $user->admin)
 {
-    print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
+	print $langs->trans('PrintUserConfDesc'.$driver)."<br><br>\n";
 
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("User").'</th>';
-    print '<th>'.$langs->trans("PrintModule").'</th>';
-    print '<th>'.$langs->trans("PrintDriver").'</th>';
-    print '<th>'.$langs->trans("Printer").'</th>';
-    print '<th>'.$langs->trans("PrinterLocation").'</th>';
-    print '<th>'.$langs->trans("PrinterId").'</th>';
-    print '<th>'.$langs->trans("NumberOfCopy").'</th>';
-    print '<th class="center">'.$langs->trans("Delete").'</th>';
-    print "</tr>\n";
-    $sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
-    $resql = $db->query($sql);
-    while ($row = $db->fetch_array($resql)) {
-        print '<tr class="oddeven">';
-        print '<td>'.$row['login'].'</td>';
-        print '<td>'.$row['module'].'</td>';
-        print '<td>'.$row['driver'].'</td>';
-        print '<td>'.$row['printer_name'].'</td>';
-        print '<td>'.$row['printer_location'].'</td>';
-        print '<td>'.$row['printer_id'].'</td>';
-        print '<td>'.$row['copy'].'</td>';
-        print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
-        print "</tr>\n";
-    }
-    print '</table>';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("User").'</th>';
+	print '<th>'.$langs->trans("PrintModule").'</th>';
+	print '<th>'.$langs->trans("PrintDriver").'</th>';
+	print '<th>'.$langs->trans("Printer").'</th>';
+	print '<th>'.$langs->trans("PrinterLocation").'</th>';
+	print '<th>'.$langs->trans("PrinterId").'</th>';
+	print '<th>'.$langs->trans("NumberOfCopy").'</th>';
+	print '<th class="center">'.$langs->trans("Delete").'</th>';
+	print "</tr>\n";
+	$sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
+	$resql = $db->query($sql);
+	while ($row = $db->fetch_array($resql)) {
+		print '<tr class="oddeven">';
+		print '<td>'.$row['login'].'</td>';
+		print '<td>'.$row['module'].'</td>';
+		print '<td>'.$row['driver'].'</td>';
+		print '<td>'.$row['printer_name'].'</td>';
+		print '<td>'.$row['printer_location'].'</td>';
+		print '<td>'.$row['printer_id'].'</td>';
+		print '<td>'.$row['copy'].'</td>';
+		print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
+		print "</tr>\n";
+	}
+	print '</table>';
 }
 
 dol_fiche_end();
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 92b9ffbd8b4..26bfd1ef1c8 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -43,7 +43,7 @@ $printername = GETPOST('printername', 'alpha');
 $printerid = GETPOST('printerid', 'int');
 $parameter = GETPOST('parameter', 'alpha');
 
-$template = GETPOST('template', 'alpha');
+$template = GETPOST('template', 'nohtml');
 $templatename = GETPOST('templatename', 'alpha');
 $templateid = GETPOST('templateid', 'int');
 
@@ -53,16 +53,16 @@ if (!$mode) $mode = 'config';
 
 // used in library escpos maybe useful if php doesn't support gzdecode
 if (!function_exists('gzdecode')) {
-    /**
-     * Gzdecode
-     *
-     * @param string    $data   data to deflate
-     * @return string           data deflated
-     */
-    function gzdecode($data)
-    {
-        return gzinflate(substr($data, 10, -8));
-    }
+	/**
+	 * Gzdecode
+	 *
+	 * @param string    $data   data to deflate
+	 * @return string           data deflated
+	 */
+	function gzdecode($data)
+	{
+		return gzinflate(substr($data, 10, -8));
+	}
 }
 
 
@@ -71,167 +71,167 @@ if (!function_exists('gzdecode')) {
  */
 
 if ($action == 'addprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printername)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterNameEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printername)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterNameEmpty"), null, 'errors');
+	}
 
-    if (empty($parameter)) {
-        setEventMessages($langs->trans("PrinterParameterEmpty"), null, 'warnings');
-    }
+	if (empty($parameter)) {
+		setEventMessages($langs->trans("PrinterParameterEmpty"), null, 'warnings');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->addPrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->addPrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter);
+		if ($result > 0) $error++;
 
-        if (!$error)
-        {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterAdded", $printername), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessages($langs->trans("PrinterAdded", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'deleteprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->deletePrinter($printerid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->deletePrinter($printerid);
+		if ($result > 0) $error++;
 
-        if (!$error)
-        {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterDeleted", $printername), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error)
+		{
+			$db->commit();
+			setEventMessages($langs->trans("PrinterDeleted", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'updateprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->updatePrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter, $printerid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->updatePrinter($printername, GETPOST('printertypeid', 'int'), GETPOST('printerprofileid', 'int'), $parameter, $printerid);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("PrinterUpdated", $printername), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("PrinterUpdated", $printername), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'testprinter' && $user->admin) {
-    $error = 0;
-    if (empty($printerid)) {
-        $error++;
-        setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($printerid)) {
+		$error++;
+		setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-        // test
-        $ret = $printer->sendTestToPrinter($printerid);
-        if ($ret == 0) {
-            setEventMessages($langs->trans("TestSentToPrinter", $printername), null);
-        } else {
-            setEventMessages($printer->error, $printer->errors, 'errors');
-        }
-    }
-    $action = '';
+	if (!$error) {
+		// test
+		$ret = $printer->sendTestToPrinter($printerid);
+		if ($ret == 0) {
+			setEventMessages($langs->trans("TestSentToPrinter", $printername), null);
+		} else {
+			setEventMessages($printer->error, $printer->errors, 'errors');
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'testtemplate' && $user->admin) {
-    $error = 0;
-    // if (empty($printerid)) {
-    //     $error++;
-    //     setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
-    // }
+	$error = 0;
+	// if (empty($printerid)) {
+	//     $error++;
+	//     setEventMessages($langs->trans("PrinterIdEmpty"), null, 'errors');
+	// }
 
-    // if (! $error) {
+	// if (! $error) {
 	// test
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$object = new Facture($db);
 	//$object->initAsSpecimen();
 	$object->fetch(18);
 	//var_dump($object->lines);
-    $ret = $printer->sendToPrinter($object, $templateid, 1);
-    if ($ret == 0) {
-        setEventMessages($langs->trans("TestTemplateToPrinter", $printername), null);
-    } else {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    }
-    //}
-    $action = '';
+	$ret = $printer->sendToPrinter($object, $templateid, 1);
+	if ($ret == 0) {
+		setEventMessages($langs->trans("TestTemplateToPrinter", $printername), null);
+	} else {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	}
+	//}
+	$action = '';
 }
 
 if ($action == 'updatetemplate' && $user->admin) {
-    $error = 0;
-    if (empty($templateid)) {
-        $error++;
-        setEventMessages($langs->trans("TemplateIdEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($templateid)) {
+		$error++;
+		setEventMessages($langs->trans("TemplateIdEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->updateTemplate($templatename, $template, $templateid);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->updateTemplate($templatename, $template, $templateid);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("TemplateUpdated", $templatename), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("TemplateUpdated", $templatename), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'addtemplate' && $user->admin) {
-    $error = 0;
-    if (empty($templatename)) {
-        $error++;
-        setEventMessages($langs->trans("TemplateNameEmpty"), null, 'errors');
-    }
+	$error = 0;
+	if (empty($templatename)) {
+		$error++;
+		setEventMessages($langs->trans("TemplateNameEmpty"), null, 'errors');
+	}
 
-    if (!$error) {
-    	$db->begin();
-    	$result = $printer->addTemplate($templatename, $template);
-        if ($result > 0) $error++;
+	if (!$error) {
+		$db->begin();
+		$result = $printer->addTemplate($templatename, $template);
+		if ($result > 0) $error++;
 
-        if (!$error) {
-            $db->commit();
-            setEventMessages($langs->trans("TemplateAdded", $templatename), null);
-        } else {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
-    $action = '';
+		if (!$error) {
+			$db->commit();
+			setEventMessages($langs->trans("TemplateAdded", $templatename), null);
+		} else {
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
+	$action = '';
 }
 
 if ($action == 'deletetemplate' && $user->admin) {
@@ -273,116 +273,116 @@ $head = receiptprinteradmin_prepare_head($mode);
 
 // mode = config
 if ($mode == 'config' && $user->admin) {
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    if ($action != 'editprinter') {
-        print '<input type="hidden" name="action" value="addprinter">';
-    } else {
-        print '<input type="hidden" name="action" value="updateprinter">';
-    }
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=config" autocomplete="off">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if ($action != 'editprinter') {
+		print '<input type="hidden" name="action" value="addprinter">';
+	} else {
+		print '<input type="hidden" name="action" value="updateprinter">';
+	}
 
 
-    dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
+	dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
-    print '<span class="opacitymedium">'.$langs->trans("ReceiptPrinterDesc")."</span><br><br>\n";
+	print '<span class="opacitymedium">'.$langs->trans("ReceiptPrinterDesc")."</span><br><br>\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Name").'</th>';
-    print '<th>'.$langs->trans("Type").'</th>';
-    print '<th>'.$langs->trans("Profile").'</th>';
-    print '<th>'.$langs->trans("Parameters").'</th>';
-    print '<th></th>';
-    print "</tr>\n";
-    $ret = $printer->listprinters();
-    $nbofprinters = count($printer->listprinters);
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Name").'</th>';
+	print '<th>'.$langs->trans("Type").'</th>';
+	print '<th>'.$langs->trans("Profile").'</th>';
+	print '<th>'.$langs->trans("Parameters").'</th>';
+	print '<th></th>';
+	print "</tr>\n";
+	$ret = $printer->listprinters();
+	$nbofprinters = count($printer->listprinters);
 
-    if ($action != 'editprinter') {
-    	print '<tr>';
-    	print '<td><input size="50" type="text" name="printername"></td>';
-    	$ret = $printer->selectTypePrinter();
-    	print '<td>'.$printer->resprint.'</td>';
-    	$ret = $printer->selectProfilePrinter();
-    	print '<td>'.$printer->profileresprint.'</td>';
-    	print '<td><input size="60" type="text" name="parameter"></td>';
-    	print '<td class="right">';
-    	if ($action != 'editprinter') {
-    		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
-    	}
-    	print '</td>';
-    	print '</tr>';
-    }
+	if ($action != 'editprinter') {
+		print '<tr>';
+		print '<td><input size="50" type="text" name="printername"></td>';
+		$ret = $printer->selectTypePrinter();
+		print '<td>'.$printer->resprint.'</td>';
+		$ret = $printer->selectProfilePrinter();
+		print '<td>'.$printer->profileresprint.'</td>';
+		print '<td><input size="60" type="text" name="parameter"></td>';
+		print '<td class="right">';
+		if ($action != 'editprinter') {
+			print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
+		}
+		print '</td>';
+		print '</tr>';
+	}
 
-    if ($ret > 0) {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    } else {
-        for ($line = 0; $line < $nbofprinters; $line++) {
-            print '<tr class="oddeven">';
-            if ($action == 'editprinter' && $printer->listprinters[$line]['rowid'] == $printerid) {
-                print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
-                print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
-                $ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
-                print '<td>'.$printer->resprint.'</td>';
-                $ret = $printer->selectProfilePrinter($printer->listprinters[$line]['fk_profile']);
-                print '<td>'.$printer->profileresprint.'</td>';
-                print '<td><input size="60" type="text" name="parameter" value="'.$printer->listprinters[$line]['parameter'].'"></td>';
-                print '<td>';
-                print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
-                print '</td>';
-                print '</tr>';
-            } else {
-                print '<td>'.$printer->listprinters[$line]['name'].'</td>';
-                print '<td>'.$langs->trans($printer->listprinters[$line]['fk_type_name']).'</td>';
-                print '<td>'.$langs->trans($printer->listprinters[$line]['fk_profile_name']).'</td>';
-                print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
-                // edit icon
-                print '<td class="right"><a class="editfielda marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
-                print img_picto($langs->trans("Edit"), 'edit');
-                print '</a>';
-                // delete icon
-                print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=deleteprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
-                print img_picto($langs->trans("Delete"), 'delete');
-                print '</a>';
-                // test icon
-                print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=testprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
-                print img_picto($langs->trans("TestPrinter"), 'printer');
-                print '</a></td>';
-                print '</tr>';
-            }
-        }
-    }
+	if ($ret > 0) {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	} else {
+		for ($line = 0; $line < $nbofprinters; $line++) {
+			print '<tr class="oddeven">';
+			if ($action == 'editprinter' && $printer->listprinters[$line]['rowid'] == $printerid) {
+				print '<input type="hidden" name="printerid" value="'.$printer->listprinters[$line]['rowid'].'">';
+				print '<td><input size="50" type="text" name="printername" value="'.$printer->listprinters[$line]['name'].'"></td>';
+				$ret = $printer->selectTypePrinter($printer->listprinters[$line]['fk_type']);
+				print '<td>'.$printer->resprint.'</td>';
+				$ret = $printer->selectProfilePrinter($printer->listprinters[$line]['fk_profile']);
+				print '<td>'.$printer->profileresprint.'</td>';
+				print '<td><input size="60" type="text" name="parameter" value="'.$printer->listprinters[$line]['parameter'].'"></td>';
+				print '<td>';
+				print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+				print '</td>';
+				print '</tr>';
+			} else {
+				print '<td>'.$printer->listprinters[$line]['name'].'</td>';
+				print '<td>'.$langs->trans($printer->listprinters[$line]['fk_type_name']).'</td>';
+				print '<td>'.$langs->trans($printer->listprinters[$line]['fk_profile_name']).'</td>';
+				print '<td>'.$printer->listprinters[$line]['parameter'].'</td>';
+				// edit icon
+				print '<td class="right"><a class="editfielda marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=editprinter&amp;printerid='.$printer->listprinters[$line]['rowid'].'">';
+				print img_picto($langs->trans("Edit"), 'edit');
+				print '</a>';
+				// delete icon
+				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=deleteprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+				print img_picto($langs->trans("Delete"), 'delete');
+				print '</a>';
+				// test icon
+				print '<a class="marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=config&amp;action=testprinter&amp;token='.newToken().'&amp;printerid='.$printer->listprinters[$line]['rowid'].'&amp;printername='.$printer->listprinters[$line]['name'].'">';
+				print img_picto($langs->trans("TestPrinter"), 'printer');
+				print '</a></td>';
+				print '</tr>';
+			}
+		}
+	}
 
-    print '</table>';
+	print '</table>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    print '</form>';
+	print '</form>';
 
-    print '<br>';
+	print '<br>';
 
 
-    print load_fiche_titre($langs->trans("ReceiptPrinterTypeDesc"), '', '')."\n";
+	print load_fiche_titre($langs->trans("ReceiptPrinterTypeDesc"), '', '')."\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT").':</td><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_FILE_PRINT").':</td><td>'.$langs->trans("CONNECTOR_FILE_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_CUPS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_CUPS_PRINT_HELP").'</td></tr>';
-    print '</table>';
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_DUMMY").':</td><td>'.$langs->trans("CONNECTOR_DUMMY_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT").':</td><td>'.$langs->trans("CONNECTOR_NETWORK_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_FILE_PRINT").':</td><td>'.$langs->trans("CONNECTOR_FILE_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_WINDOWS_PRINT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("CONNECTOR_CUPS_PRINT").':</td><td>'.$langs->trans("CONNECTOR_CUPS_PRINT_HELP").'</td></tr>';
+	print '</table>';
 
-    print '<br>';
+	print '<br>';
 
 
-    print load_fiche_titre($langs->trans("ReceiptPrinterProfileDesc"), '', '')."\n";
+	print load_fiche_titre($langs->trans("ReceiptPrinterProfileDesc"), '', '')."\n";
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_DEFAULT").':</td><td>'.$langs->trans("PROFILE_DEFAULT_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_SIMPLE").':</td><td>'.$langs->trans("PROFILE_SIMPLE_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_EPOSTEP").':</td><td>'.$langs->trans("PROFILE_EPOSTEP_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_P822D").':</td><td>'.$langs->trans("PROFILE_P822D_HELP").'</td></tr>';
-    print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_STAR").':</td><td>'.$langs->trans("PROFILE_STAR_HELP").'</td></tr>';
-    print '</table>';
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_DEFAULT").':</td><td>'.$langs->trans("PROFILE_DEFAULT_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_SIMPLE").':</td><td>'.$langs->trans("PROFILE_SIMPLE_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_EPOSTEP").':</td><td>'.$langs->trans("PROFILE_EPOSTEP_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_P822D").':</td><td>'.$langs->trans("PROFILE_P822D_HELP").'</td></tr>';
+	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_STAR").':</td><td>'.$langs->trans("PROFILE_STAR_HELP").'</td></tr>';
+	print '</table>';
 }
 
 // mode = template
@@ -390,56 +390,56 @@ if ($mode == 'template' && $user->admin) {
 	dol_fiche_head($head, $mode, $langs->trans("ModuleSetup"), -1, 'technic');
 
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?mode=template" autocomplete="off">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    if ($action != 'edittemplate') {
-        print '<input type="hidden" name="action" value="addtemplate">';
-    } else {
-        print '<input type="hidden" name="action" value="updatetemplate">';
-    }
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	if ($action != 'edittemplate') {
+		print '<input type="hidden" name="action" value="addtemplate">';
+	} else {
+		print '<input type="hidden" name="action" value="updatetemplate">';
+	}
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Name").'</th>';
-    print '<th>'.$langs->trans("Template").'</th>';
-    print '<th></th>';
-    print "</tr>\n";
-    $ret = $printer->listPrintersTemplates();
-    //print '<pre>'.print_r($printer->listprinterstemplates, true).'</pre>';
-    if ($ret > 0) {
-        setEventMessages($printer->error, $printer->errors, 'errors');
-    } else {
-        $max = count($printer->listprinterstemplates);
-        for ($line = 0; $line < $max; $line++) {
-            print '<tr class="oddeven">';
-            if ($action == 'edittemplate' && $printer->listprinterstemplates[$line]['rowid'] == $templateid) {
-                print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
-                print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
-                print '<td>';
-                print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
-                print '</td>';
-                print '<td></td>';
-            } else {
-                print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
-                print '<td>'.nl2br(htmlentities($printer->listprinterstemplates[$line]['template'])).'</td>';
-                // edit icon
-                print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
-                print img_picto($langs->trans("Edit"), 'edit');
-                print '</a>';
-                // delete icon
-                print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
-                print img_picto($langs->trans("Delete"), 'delete');
-                print '</a>';
-                // test icon
-                print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
-                print img_picto($langs->trans("TestPrinterTemplate"), 'printer');
-                print '</a></td>';
-            }
-            print '</tr>';
-        }
-    }
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Name").'</th>';
+	print '<th>'.$langs->trans("Template").'</th>';
+	print '<th></th>';
+	print "</tr>\n";
+	$ret = $printer->listPrintersTemplates();
+	//print '<pre>'.print_r($printer->listprinterstemplates, true).'</pre>';
+	if ($ret > 0) {
+		setEventMessages($printer->error, $printer->errors, 'errors');
+	} else {
+		$max = count($printer->listprinterstemplates);
+		for ($line = 0; $line < $max; $line++) {
+			print '<tr class="oddeven">';
+			if ($action == 'edittemplate' && $printer->listprinterstemplates[$line]['rowid'] == $templateid) {
+				print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
+				print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
+				print '<td>';
+				print '<textarea name="template" wrap="soft" cols="120" rows="12">'.$printer->listprinterstemplates[$line]['template'].'</textarea>';
+				print '</td>';
+				print '<td></td>';
+			} else {
+				print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
+				print '<td>'.nl2br(htmlentities($printer->listprinterstemplates[$line]['template'])).'</td>';
+				// edit icon
+				print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
+				print img_picto($langs->trans("Edit"), 'edit');
+				print '</a>';
+				// delete icon
+				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=deletetemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
+				print img_picto($langs->trans("Delete"), 'delete');
+				print '</a>';
+				// test icon
+				print '<a class="paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=testtemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'&amp;templatename='.$printer->listprinterstemplates[$line]['name'].'">';
+				print img_picto($langs->trans("TestPrinterTemplate"), 'printer');
+				print '</a></td>';
+			}
+			print '</tr>';
+		}
+	}
 
-    if ($action != 'edittemplate') {
-    	print '<tr>';
+	if ($action != 'edittemplate') {
+		print '<tr>';
 		print '<td><input size="50" type="text" name="templatename" value="'.$printer->listprinterstemplates[$line]['name'].'"></td>';
 		print '<td>';
 		print '<textarea name="template" wrap="soft" cols="120" rows="12">';
@@ -448,35 +448,35 @@ if ($mode == 'template' && $user->admin) {
 		print '</td>';
 		print '<td></td>';
 		print '</tr>';
-    }
+	}
 
-    print '</table>';
+	print '</table>';
 
-    if ($action != 'edittemplate') {
+	if ($action != 'edittemplate') {
 		print '<input type="hidden" name="templateid" value="'.$printer->listprinterstemplates[$line]['rowid'].'">';
 		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'"></div>';
-    } else {
-        print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
-    }
-    print '</form>';
+	} else {
+		print '<div class="center"><input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Save")).'"></div>';
+	}
+	print '</form>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    print '<br>';
+	print '<br>';
 
-    print '<table class="noborder centpercent">'."\n";
-    print '<tr class="liste_titre">';
-    print '<th>'.$langs->trans("Tag").'</th>';
-    print '<th>'.$langs->trans("Description").'</th>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">'."\n";
+	print '<tr class="liste_titre">';
+	print '<th>'.$langs->trans("Tag").'</th>';
+	print '<th>'.$langs->trans("Description").'</th>';
+	print "</tr>\n";
 
-    $langs->loadLangs(array("bills", "companies"));
-    foreach ($printer->tags as $key => $val) {
-        print '<tr class="oddeven">';
-        print '<td>&lt;'.$key.'&gt;</td><td>'.$langs->trans($val).'</td>';
-        print '</tr>';
-    }
-    print '</table>';
+	$langs->loadLangs(array("bills", "companies"));
+	foreach ($printer->tags as $key => $val) {
+		print '<tr class="oddeven">';
+		print '<td>{'.$key.'}</td><td>'.$langs->trans($val).'</td>';
+		print '</tr>';
+	}
+	print '</table>';
 }
 
 // End of page
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index daa43110529..a2e97b45869 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -45,9 +45,9 @@ $upload_dir = $conf->admin->dir_temp;
 
 if (GETPOST('sendit') && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-    dol_add_file_process($upload_dir, 1, 0, 'userfile');
+	dol_add_file_process($upload_dir, 1, 0, 'userfile');
 }
 
 if ($action == 'updateform')
@@ -144,14 +144,14 @@ print '</td>';
 print '<td>';
 if (ini_get('safe_mode') && !empty($conf->global->MAIN_ANTIVIRUS_COMMAND))
 {
-    $langs->load("errors");
-    $basedir = preg_replace('/"/', '', dirname($conf->global->MAIN_ANTIVIRUS_COMMAND));
-    $listdir = explode(';', ini_get('safe_mode_exec_dir'));
-    if (!in_array($basedir, $listdir))
-    {
-        print img_warning($langs->trans('WarningSafeModeOnCheckExecDir'));
-        dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
-    }
+	$langs->load("errors");
+	$basedir = preg_replace('/"/', '', dirname($conf->global->MAIN_ANTIVIRUS_COMMAND));
+	$listdir = explode(';', ini_get('safe_mode_exec_dir'));
+	if (!in_array($basedir, $listdir))
+	{
+		print img_warning($langs->trans('WarningSafeModeOnCheckExecDir'));
+		dol_syslog("safe_mode is on, basedir is ".$basedir.", safe_mode_exec_dir is ".ini_get('safe_mode_exec_dir'), LOG_WARNING);
+	}
 }
 print '<input type="text" name="MAIN_ANTIVIRUS_COMMAND" class="minwidth500imp" value="'.(!empty($conf->global->MAIN_ANTIVIRUS_COMMAND) ?dol_escape_htmltag($conf->global->MAIN_ANTIVIRUS_COMMAND) : '').'">';
 if (defined('MAIN_ANTIVIRUS_COMMAND')) {
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index ec6dc9d4a88..7857773924f 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -49,7 +49,7 @@ llxHeader();
 
 print load_fiche_titre($langs->trans("PerfDolibarr"), '', 'title_setup');
 
-print $langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').' (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
+print '<span class="opacitymedium">'.$langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').'</span> (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
 
 // Recupere la version de PHP
 $phpversion = version_php();
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 05038c13bbc..9f1766a5d22 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -265,14 +265,19 @@ $db->close();
  */
 function getActivatedExtensions()
 {
-	$file    = getConfigFilePath();
-	$handle  = fopen(GetConfigFilePath(), "r");
+	$file    = trim(getConfigFilePath());
+	$handle  = fopen($file, "r");
 	$content = fread($handle, filesize($file));
 
 	fclose($handle);
 
 	$configLines = explode("\r", $content);
 
+	// For compatibility with LF (Line Feed)
+	if (empty($configLines) || count($configLines) < 2) {
+	    $configLines = explode("\n", $content);
+	}
+
 	$extensions = array();
 	$lastLine = "";
 
@@ -281,11 +286,13 @@ function getActivatedExtensions()
 		$line = trim($line);
 
 		// ignore comment lines
-		if (substr($line, 0, 1) === ";")
+		if (substr($line, 0, 1) === ";" || empty($line))
 		{
 			continue;
 		}
 
+		// var_dump($line);
+
 		// extension
 		if (substr($line, 0, 9) === "extension" && substr($line, 0, 10) !== "extension_")
 		{
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
new file mode 100644
index 00000000000..0cf70f2bbaa
--- /dev/null
+++ b/htdocs/admin/system/security.php
@@ -0,0 +1,143 @@
+<?php
+/* Copyright (C) 2013-2019	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/>.
+ */
+
+/**
+ *  \file       htdocs/admin/system/security.php
+ *  \brief      Page to show Security information
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("install", "other", "admin"));
+
+if (!$user->admin)
+	accessforbidden();
+
+if (GETPOST('action', 'aZ09') == 'donothing')
+{
+	exit;
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$nowstring = dol_print_date(dol_now(), 'dayhourlog');
+
+llxHeader();
+
+print load_fiche_titre($langs->trans("Security"), '', 'title_setup');
+
+print '<span class="opacitymedium">'.$langs->trans("YouMayFindSecurityAdviceHere", 'hhttps://wiki.dolibarr.org/index.php/Security_information').'</span> (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
+
+// Recupere la version de PHP
+$phpversion = version_php();
+print "<br><strong>PHP</strong> - ".$langs->trans("Version").": ".$phpversion."<br>\n";
+
+// Recupere la version du serveur web
+print "<br><strong>Web server</strong> - ".$langs->trans("Version").": ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";
+print '<br>';
+
+
+print load_fiche_titre($langs->trans("ConfigFile"), '', '');
+
+print '<strong>'.$langs->trans("dolibarr_main_prod").'</strong>: '.$dolibarr_main_prod;
+// dolibarr_main_prod
+
+
+print '<br>';
+print '<br>';
+
+print load_fiche_titre($langs->trans("PermissionsOnFiles"), '', '');
+
+print '<strong>'.$langs->trans("PermissionOnFileInWebRoot").'</strong>: ';
+// TODO
+
+
+print '<br>';
+print '<br>';
+
+
+print load_fiche_titre($langs->trans("Modules"), '', '');
+
+// XDebug
+print '<strong>'.$langs->trans("XDebug").'</strong>: ';
+$test = !function_exists('xdebug_is_enabled');
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+else {
+	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("XDebug"));
+	print ' - '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php">XDebug admin page</a>';
+}
+print '<br>';
+
+// Module log
+print '<br>';
+print '<strong>'.$langs->trans("Syslog").'</strong>: ';
+$test = empty($conf->syslog->enabled);
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+else {
+	print img_picto('', 'warning').' '.$langs->trans("ModuleActivatedMayExposeInformation", $langs->transnoentities("Syslog"));
+	//print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+}
+print '<br>';
+
+// Module debugbar
+print '<br>';
+print '<strong>'.$langs->trans("DebugBar").'</strong>: ';
+$test = empty($conf->debugbar->enabled);
+if ($test) print img_picto('', 'tick.png').' '.$langs->trans("NotInstalled");
+else {
+	print img_picto('', 'error').' '.$langs->trans("ModuleActivatedDoNotUseInProduction", $langs->transnoentities("DebugBar"));
+    //print ' '.$langs->trans("MoreInformation").' <a href="'.DOL_URL_ROOT.'/admin/system/xdebug.php'.'">XDebug admin page</a>';
+}
+print '<br>';
+print '<br>';
+
+print load_fiche_titre($langs->trans("SecuritySetup"), '', '');
+
+//print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
+print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.$conf->global->MAIN_SECURITY_HASH_ALGO." &nbsp; (Recommanded value: 'password_hash')<br>";
+print '<strong>MAIN_SECURITY_SALT</strong> = '.$conf->global->MAIN_SECURITY_SALT.'<br>';
+print '<br>';
+// TODO
+
+print '<strong>'.$langs->trans("AntivirusEnabledOnUpload").'</strong>: ';
+// TODO
+print '<br>';
+
+print '<strong>'.$langs->trans("SecurityAudit").'</strong>: ';
+// TODO Disabled or enabled ?
+print '<br>';
+
+
+
+
+
+
+
+
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 27efdb3c52f..5e990709d19 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -65,6 +65,7 @@ if ($action == 'delete')
 	$action = '';
 }
 
+
 /*
  * View
  */
@@ -119,7 +120,9 @@ if (in_array($type, array('pgsql'))) {
 print "});\n";
 print "</script>\n";
 
-print load_fiche_titre($langs->trans("Backup"), '', 'title_setup');
+$title = $langs->trans("Backup");
+
+print load_fiche_titre($title, '', 'title_setup');
 //print_barre_liste($langs->trans("Backup"), '', '', '', '', '', $langs->trans("BackupDesc",DOL_DATA_ROOT), 0, 0, 'title_setup');
 
 print '<div class="center opacitymedium">';
@@ -139,7 +142,9 @@ print '<br>';
 
 print '<div id="backupdatabaseleft" class="fichehalfleft" >';
 
-print load_fiche_titre($title ? $title : $langs->trans("BackupDumpWizard"));
+$title = $langs->trans("BackupDumpWizard");
+
+print load_fiche_titre($title);
 
 print '<table width="100%" class="'.($useinecm ? 'nobordernopadding' : 'liste').' nohover">';
 print '<tr class="liste_titre">';
@@ -155,19 +160,19 @@ print '<td class="tdtop">';
 print '<div id="div_container_exportoptions">';
 print '<fieldset id="exportoptions"><legend>'.$langs->trans("ExportMethod").'</legend>';
 if (in_array($type, array('mysql', 'mysqli'))) {
-    print '<div class="formelementrow"><input type="radio" name="what" value="mysql" id="radio_dump_mysql" />';
-    print '<label for="radio_dump_mysql">MySQL	Dump (mysqldump)</label>';
-    print '</div>';
-    print '<br>';
-    print '<div class="formelementrow"><input type="radio" name="what" value="mysqlnobin" id="radio_dump_mysql_nobin" />';
-    print '<label for="radio_dump_mysql_nobin">MySQL Dump (php) '.img_warning($langs->trans('BackupPHPWarning')).'</label>';
-    print '</div>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="mysql" id="radio_dump_mysql" />';
+	print '<label for="radio_dump_mysql">MySQL	Dump (mysqldump)</label>';
+	print '</div>';
+	print '<br>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="mysqlnobin" id="radio_dump_mysql_nobin" />';
+	print '<label for="radio_dump_mysql_nobin">MySQL Dump (php) '.img_warning($langs->trans('BackupPHPWarning')).'</label>';
+	print '</div>';
 } elseif (in_array($type, array('pgsql'))) {
-    print '<div class="formelementrow"><input type="radio" name="what" value="postgresql" id="radio_dump_postgresql" />';
-    print '<label for="radio_dump_postgresql">PostgreSQL Dump (pg_dump)</label>';
-    print '</div>';
+	print '<div class="formelementrow"><input type="radio" name="what" value="postgresql" id="radio_dump_postgresql" />';
+	print '<label for="radio_dump_postgresql">PostgreSQL Dump (pg_dump)</label>';
+	print '</div>';
 } else {
-    print 'No method available with database '.$label;
+	print 'No method available with database '.$label;
 }
 print '</fieldset>';
 print '</div>';
@@ -178,200 +183,200 @@ print '<td class="tdtop">';
 
 print '<div id="div_container_sub_exportoptions">';
 if (in_array($type, array('mysql', 'mysqli'))) {
-    print "<!--  Fieldset mysqldump -->\n";
-    print '<fieldset id="mysql_options"><legend>'.$langs->trans("MySqlExportParameters").'</legend>';
+	print "<!--  Fieldset mysqldump -->\n";
+	print '<fieldset id="mysql_options"><legend>'.$langs->trans("MySqlExportParameters").'</legend>';
 
-    print '<div class="formelementrow">'.$langs->trans("FullPathToMysqldumpCommand");
-    if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
-    {
-        $fullpathofmysqldump = $db->getPathOfDump();
-    } else {
-        $fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
-    }
-    print '<br>';
-    print '<input type="text" name="mysqldump" style="width: 80%" value="'.$fullpathofmysqldump.'" /></div>';
+	print '<div class="formelementrow">'.$langs->trans("FullPathToMysqldumpCommand");
+	if (empty($conf->global->SYSTEMTOOLS_MYSQLDUMP))
+	{
+		$fullpathofmysqldump = $db->getPathOfDump();
+	} else {
+		$fullpathofmysqldump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
+	}
+	print '<br>';
+	print '<input type="text" name="mysqldump" style="width: 80%" value="'.$fullpathofmysqldump.'" /></div>';
 
-    print '<br>';
-    print '<fieldset><legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<div class="formelementrow">';
-    print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />';
-    print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
-    print '</div>';
+	print '<br>';
+	print '<fieldset><legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<div class="formelementrow">';
+	print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />';
+	print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
+	print '</div>';
 
-    if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
-        print '<div class="formelementrow">';
-        print '<input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" checked />';
-        print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
-        print '</div>';
-    }
+	if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
+		print '<div class="formelementrow">';
+		print '<input type="checkbox" name="disable_fk" value="yes" id="checkbox_disable_fk" checked />';
+		print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
+		print '</div>';
+	}
 
-    print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
+	print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
 
-    print '<select name="sql_compat" id="select_sql_compat" class="flat">';
-    print '<option value="NONE" selected>NONE</option>';
-    print '<option value="ANSI">ANSI</option>';
-    print '<option value="DB2">DB2</option>';
-    print '<option value="MAXDB">MAXDB</option>';
-    print '<option value="MYSQL323">MYSQL323</option>';
-    print '<option value="MYSQL40">MYSQL40</option>';
-    print '<option value="MSSQL">MSSQL</option>';
-    print '<option value="ORACLE">ORACLE</option>';
-    print '<option value="POSTGRESQL">POSTGRESQL</option>';
-    print '</select>';
-    print '<br>';
+	print '<select name="sql_compat" id="select_sql_compat" class="flat">';
+	print '<option value="NONE" selected>NONE</option>';
+	print '<option value="ANSI">ANSI</option>';
+	print '<option value="DB2">DB2</option>';
+	print '<option value="MAXDB">MAXDB</option>';
+	print '<option value="MYSQL323">MYSQL323</option>';
+	print '<option value="MYSQL40">MYSQL40</option>';
+	print '<option value="MSSQL">MSSQL</option>';
+	print '<option value="ORACLE">ORACLE</option>';
+	print '<option value="POSTGRESQL">POSTGRESQL</option>';
+	print '</select>';
+	print '<br>';
 
-    print '<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" />';
-    print '<label for="checkbox_use_quick">';
-    print $form->textwithpicto($langs->trans('ExportUseMySQLQuickParameter'), $langs->trans('ExportUseMySQLQuickParameterHelp'));
+	print '<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" />';
+	print '<label for="checkbox_use_quick">';
+	print $form->textwithpicto($langs->trans('ExportUseMySQLQuickParameter'), $langs->trans('ExportUseMySQLQuickParameterHelp'));
 	print '</label>';
 	print '<br/>';
 
-    print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
-    print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
-    print '-->';
-    print '</fieldset>';
+	print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
+	print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
+	print '-->';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
-    print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
-    print '</legend>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
+	print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
+	print '</legend>';
 
-    print '<input type="checkbox" name="drop"'.((! GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
-    print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
-    print '<br>';
-    print '</fieldset>';
+	print '<input type="checkbox" name="drop"'.((! GETPOSTISSET("drop") || GETPOST('drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+	print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
+	print '<br>';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
-    print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
-    print '</legend>';
-    print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
-    print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
-    print '<br>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
+	print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
+	print '</legend>';
+	print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
+	print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" checked />';
-    print '<label for="checkbox_dump_extended_ins">'.$langs->trans("ExtendedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="extended_ins" value="yes" id="checkbox_dump_extended_ins" checked />';
+	print '<label for="checkbox_dump_extended_ins">'.$langs->trans("ExtendedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="disable-add-locks" value="no" id="checkbox_dump_disable-add-locks" />';
-    print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="disable-add-locks" value="no" id="checkbox_dump_disable-add-locks" />';
+	print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="delayed" value="yes" id="checkbox_dump_delayed" />';
-    print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="delayed" value="yes" id="checkbox_dump_delayed" />';
+	print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="sql_ignore" value="yes" id="checkbox_dump_ignore" />';
-    print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="sql_ignore" value="yes" id="checkbox_dump_ignore" />';
+	print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="hexforbinary" value="yes" id="checkbox_hexforbinary" checked />';
-    print '<label for="checkbox_hexforbinary">'.$langs->trans("EncodeBinariesInHexa").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="hexforbinary" value="yes" id="checkbox_hexforbinary" checked />';
+	print '<label for="checkbox_hexforbinary">'.$langs->trans("EncodeBinariesInHexa").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
-    print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
+	print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
+	print '<br>';
 
-    print '</fieldset>';
-    print '</fieldset>';
-    print "<!--  Fieldset mysql_nobin -->\n";
-    print '<fieldset id="mysql_nobin_options">';
-    print '<legend>'.$langs->trans("MySqlExportParameters").'</legend>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<div class="formelementrow">';
-    print '<input type="checkbox" name="nobin_use_transaction" value="yes" id="checkbox_use_transaction" />';
-    print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
+	print '</fieldset>';
+	print '</fieldset>';
+	print "<!--  Fieldset mysql_nobin -->\n";
+	print '<fieldset id="mysql_nobin_options">';
+	print '<legend>'.$langs->trans("MySqlExportParameters").'</legend>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<div class="formelementrow">';
+	print '<input type="checkbox" name="nobin_use_transaction" value="yes" id="checkbox_use_transaction" />';
+	print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
 
-    print '</div>';
-    if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
-        print '<div class="formelementrow">';
-        print '<input type="checkbox" name="nobin_disable_fk" value="yes" id="checkbox_disable_fk" checked />';
-        print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
-        print '</div>';
-    }
-    print '</fieldset>';
+	print '</div>';
+	if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
+		print '<div class="formelementrow">';
+		print '<input type="checkbox" name="nobin_disable_fk" value="yes" id="checkbox_disable_fk" checked />';
+		print '<label for="checkbox_disable_fk">'.$langs->trans("CommandsToDisableForeignKeysForImport").' '.img_info($langs->trans('CommandsToDisableForeignKeysForImportWarning')).'</label>';
+		print '</div>';
+	}
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset><legend>'.$langs->trans('ExportStructure').'</legend>';
-    print '<input type="checkbox" name="nobin_drop"'.((! GETPOSTISSET("nobin_drop") || GETPOST('nobin_drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
-    print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
-    print '<br>';
-    print '</fieldset>';
+	print '<br>';
+	print '<fieldset><legend>'.$langs->trans('ExportStructure').'</legend>';
+	print '<input type="checkbox" name="nobin_drop"'.((! GETPOSTISSET("nobin_drop") || GETPOST('nobin_drop')) ? ' checked' : '').' id="checkbox_dump_drop" />';
+	print '<label for="checkbox_dump_drop">'.$langs->trans("AddDropTable").'</label>';
+	print '<br>';
+	print '</fieldset>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("Datas").'</legend>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("Datas").'</legend>';
 
-    print '<input type="checkbox" name="nobin_nolocks" value="no" id="checkbox_dump_disable-add-locks" />';
-    print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_nolocks" value="no" id="checkbox_dump_disable-add-locks" />';
+	print '<label for="checkbox_dump_disable-add-locks">'.$langs->trans("NoLockBeforeInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_delayed" value="yes" id="checkbox_dump_delayed" />';
-    print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_delayed" value="yes" id="checkbox_dump_delayed" />';
+	print '<label for="checkbox_dump_delayed">'.$langs->trans("DelayedInsert").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_sql_ignore" value="yes" id="checkbox_dump_ignore" />';
-    print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_sql_ignore" value="yes" id="checkbox_dump_ignore" />';
+	print '<label for="checkbox_dump_ignore">'.$langs->trans("IgnoreDuplicateRecords").'</label>';
+	print '<br>';
 
-    print '<input type="checkbox" name="nobin_charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
-    print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
-    print '<br>';
+	print '<input type="checkbox" name="nobin_charset_utf8" value="yes" id="checkbox_charset_utf8" checked disabled />';
+	print '<label for="checkbox_charset_utf8">'.$langs->trans("UTF8").'</label>';
+	print '<br>';
 
-    print '</fieldset>';
-    print '</fieldset>';
+	print '</fieldset>';
+	print '</fieldset>';
 }
 
 if (in_array($type, array('pgsql'))) {
-    print "<!--  Fieldset pg_dump -->\n";
-    print '<fieldset id="postgresql_options"><legend>'.$langs->trans("PostgreSqlExportParameters").'</legend>';
+	print "<!--  Fieldset pg_dump -->\n";
+	print '<fieldset id="postgresql_options"><legend>'.$langs->trans("PostgreSqlExportParameters").'</legend>';
 
-    print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
-    if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
-        $fullpathofpgdump = $db->getPathOfDump();
-    } else {
-        $fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
-    }
-    print '<br>';
-    print '<input type="text" name="postgresqldump" style="width: 80%" value="'.$fullpathofpgdump.'" /></div>';
+	print '<div class="formelementrow">'.$langs->trans("FullPathToPostgreSQLdumpCommand");
+	if (empty($conf->global->SYSTEMTOOLS_POSTGRESQLDUMP)) {
+		$fullpathofpgdump = $db->getPathOfDump();
+	} else {
+		$fullpathofpgdump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+	}
+	print '<br>';
+	print '<input type="text" name="postgresqldump" style="width: 80%" value="'.$fullpathofpgdump.'" /></div>';
 
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>'.$langs->trans("ExportOptions").'</legend>';
-    print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
-    print '<select name="sql_compat" id="select_sql_compat" class="flat">';
-    print '<option value="POSTGRESQL" selected>POSTGRESQL</option>';
-    print '<option value="ANSI">ANSI</option>';
-    print '</select>';
-    print '<br>';
-    print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
-    print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
-    print '-->';
-    print '</fieldset>';
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
-    print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
-    print '</legend>';
-    print '</fieldset>';
-    print '<br>';
-    print '<fieldset>';
-    print '<legend>';
-    print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
-    print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
-    print '</legend>';
-    print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
-    print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
-    print '<br>';
-    print '</fieldset>';
-    print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>'.$langs->trans("ExportOptions").'</legend>';
+	print '<label for="select_sql_compat">'.$langs->trans("ExportCompatibility").'</label>';
+	print '<select name="sql_compat" id="select_sql_compat" class="flat">';
+	print '<option value="POSTGRESQL" selected>POSTGRESQL</option>';
+	print '<option value="ANSI">ANSI</option>';
+	print '</select>';
+	print '<br>';
+	print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
+	print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
+	print '-->';
+	print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_structure" value="structure" id="checkbox_sql_structure" checked />';
+	print '<label for="checkbox_sql_structure">'.$langs->trans('ExportStructure').'</label>';
+	print '</legend>';
+	print '</fieldset>';
+	print '<br>';
+	print '<fieldset>';
+	print '<legend>';
+	print '<input type="checkbox" name="sql_data" value="data" id="checkbox_sql_data" checked />';
+	print '<label for="checkbox_sql_data">'.$langs->trans("Datas").'</label>';
+	print '</legend>';
+	print '<input type="checkbox" name="showcolumns" value="yes" id="checkbox_dump_showcolumns" checked />';
+	print '<label for="checkbox_dump_showcolumns">'.$langs->trans("NameColumn").'</label>';
+	print '<br>';
+	print '</fieldset>';
+	print '</fieldset>';
 }
 print '</div>';
 
@@ -418,16 +423,16 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	//     'id' => 'radio_compression_zip',
 	//     'label' => $langs->trans("FormatZip")
 	// );
-    $compression['bz'] = array(
+	$compression['bz'] = array(
 		'function' => 'bzopen',
 		'id' => 'radio_compression_bzip',
 		'label' => $langs->trans("Bzip2")
 	);
-    $compression['none'] = array(
-    	'function' => '',
-    	'id' => 'radio_compression_none',
-    	'label' => $langs->trans("None")
-    );
+	$compression['none'] = array(
+		'function' => '',
+		'id' => 'radio_compression_none',
+		'label' => $langs->trans("None")
+	);
 } else {
 	$compression['none'] = array(
 		'function' => '',
@@ -480,14 +485,14 @@ print '<br>';
 
 if (!empty($_SESSION["commandbackuplastdone"]))
 {
-    print '<br><b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
-    print '<textarea rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuplastdone"].'</textarea><br>'."\n";
-    print '<br>';
+	print '<br><b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
+	print '<textarea rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuplastdone"].'</textarea><br>'."\n";
+	print '<br>';
 
-    //print $paramclear;
+	//print $paramclear;
 
-    // Now show result
-    print '<b>'.$langs->trans("BackupResult").':</b> ';
+	// Now show result
+	print '<b>'.$langs->trans("BackupResult").':</b> ';
 	print $_SESSION["commandbackupresult"];
 
 	$_SESSION["commandbackuplastdone"] = '';
@@ -568,20 +573,20 @@ $filecompression['zip'] = array('function' => 'dol_compress_dir', 'id' => 'radio
 $i = 0;
 foreach ($filecompression as $key => $val)
 {
-    if (!$val['function'] || function_exists($val['function']))	// Enabled export format
-    {
-    	$checked = '';
-    	if ($key == 'gz') $checked = ' checked';
-        print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
-        print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-    } else // Disabled export format
-    {
-        print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
-        print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
-        print ' <span class="opacitymedium">('.$langs->trans("NotAvailable").')</span>';
-    }
-    print ' &nbsp; &nbsp; ';
-    $i++;
+	if (!$val['function'] || function_exists($val['function']))	// Enabled export format
+	{
+		$checked = '';
+		if ($key == 'gz') $checked = ' checked';
+		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'"'.$checked.'>';
+		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
+	} else // Disabled export format
+	{
+		print '<input type="radio" name="compression" value="'.$key.'" id="'.$val['id'].'" disabled>';
+		print ' <label for="'.$val['id'].'">'.$val['label'].'</label>';
+		print ' <span class="opacitymedium">('.$langs->trans("NotAvailable").')</span>';
+	}
+	print ' &nbsp; &nbsp; ';
+	$i++;
 }
 
 print '</div>';
diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
index cbe25f0ff75..7ab26f6f6e0 100644
--- a/htdocs/admin/tools/export.php
+++ b/htdocs/admin/tools/export.php
@@ -122,7 +122,7 @@ $utils = new Utils($db);
 // MYSQL
 if ($what == 'mysql')
 {
-    $cmddump = GETPOST("mysqldump"); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
+    $cmddump = GETPOST("mysqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
     $cmddump = dol_sanitizePathName($cmddump);
 
     if (!empty($dolibarr_main_restrict_os_commands))
@@ -163,7 +163,7 @@ if ($what == 'mysqlnobin')
 // POSTGRESQL
 if ($what == 'postgresql')
 {
-    $cmddump = GETPOST("postgresqldump"); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
+    $cmddump = GETPOST("postgresqldump", 'none'); // Do not sanitize here with 'alpha', will be sanitize later by dol_sanitizePathName and escapeshellarg
     $cmddump = dol_sanitizePathName($cmddump);
 
     /* Not required, the command is output on screen but not ran for pgsql
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 485df8c318b..28eaa2d9d54 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -113,7 +113,7 @@ $utils = new Utils($db);
 if ($compression == 'zip')
 {
 	$file .= '.zip';
-    $ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.log|\/temp\/|documents\/admin\/documents\/)/');
+    $ret = dol_compress_dir(DOL_DATA_ROOT, $outputdir."/".$file, $compression, '/(\.back|\.old|\.log|[\\\/]temp[\\\/]|documents[\\\/]admin[\\\/]documents[\\\/])/i');
     if ($ret < 0)
     {
     	if ($ret == -2) {
diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index 32567f14074..82111e0716d 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -167,7 +167,7 @@ $usefilter = 0;
 
 $sql = "SELECT e.rowid, e.type, e.ip, e.user_agent, e.dateevent,";
 $sql .= " e.fk_user, e.description, e.prefix_session,";
-$sql .= " u.login";
+$sql .= " u.login, u.admin, u.entity, u.firstname, u.lastname, u.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."events as e";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = e.fk_user";
 $sql .= " WHERE e.entity IN (".getEntity('event').")";
@@ -337,7 +337,18 @@ if ($result)
 		{
 			$userstatic->id = $obj->fk_user;
 			$userstatic->login = $obj->login;
+			$userstatic->admin = $obj->admin;
+			$userstatic->entity = $obj->entity;
+			$userstatic->status = $obj->status;
+
 			print $userstatic->getLoginUrl(1);
+			if (!empty($conf->multicompany->enabled) && $userstatic->admin && !$userstatic->entity)
+			{
+				print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
+			} elseif ($userstatic->admin)
+			{
+				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+			}
 		} else print '&nbsp;';
 		print '</td>';
 
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 560530c9161..c962a9fb776 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -73,16 +73,16 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $transkey = '';
-    $transvalue = '';
-    $toselect = '';
-    $search_array_options = array();
+	$transkey = '';
+	$transvalue = '';
+	$toselect = '';
+	$search_array_options = array();
 }
 
 if ($action == 'setMAIN_ENABLE_OVERWRITE_TRANSLATION')
 {
-    if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, 'chaine', 0, '', $conf->entity);
-    else dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 0, 'chaine', 0, '', $conf->entity);
+	if (GETPOST('value')) dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 1, 'chaine', 0, '', $conf->entity);
+	else dolibarr_set_const($db, 'MAIN_ENABLE_OVERWRITE_TRANSLATION', 0, 'chaine', 0, '', $conf->entity);
 }
 
 if ($action == 'update')
@@ -139,25 +139,25 @@ if ($action == 'add')
 	}
 	if (!$error)
 	{
-	    $db->begin();
+		$db->begin();
 
-	    $sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."overwrite_trans(lang, transkey, transvalue, entity) VALUES ('".$db->escape($langcode)."','".$db->escape($transkey)."','".$db->escape($transvalue)."', ".$db->escape($conf->entity).")";
 		$result = $db->query($sql);
 		if ($result > 0)
 		{
-		    $db->commit();
-		    setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			$db->commit();
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
 			$action = "";
 			$transkey = "";
 			$transvalue = "";
 		} else {
-		    $db->rollback();
-		    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
-		    {
-		        setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
-		    } else {
-		        setEventMessages($db->lasterror(), null, 'errors');
-            }
+			$db->rollback();
+			if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
+			{
+				setEventMessages($langs->trans("WarningAnEntryAlreadyExistForTransKey"), null, 'warnings');
+			} else {
+				setEventMessages($db->lasterror(), null, 'errors');
+			}
 			$action = '';
 		}
 	}
@@ -196,15 +196,15 @@ $enabledisablehtml = '';
 $enabledisablehtml .= $langs->trans("EnableOverwriteTranslation").' ';
 if (empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
 {
-    // Button off, click to enable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=1'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
-    $enabledisablehtml .= '</a>';
+	// Button off, click to enable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=1'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Disabled"), 'switch_off');
+	$enabledisablehtml .= '</a>';
 } else {
-    // Button on, click to disable
-    $enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=0'.$param.'">';
-    $enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
-    $enabledisablehtml .= '</a>';
+	// Button on, click to disable
+	$enabledisablehtml .= '<a class="reposition valignmiddle" href="'.$_SERVER["PHP_SELF"].'?action=setMAIN_ENABLE_OVERWRITE_TRANSLATION&token='.newToken().'&value=0'.$param.'">';
+	$enabledisablehtml .= img_picto($langs->trans("Activated"), 'switch_on');
+	$enabledisablehtml .= '</a>';
 }
 
 print load_fiche_titre($langs->trans("Translation"), $enabledisablehtml, 'title_setup');
@@ -247,43 +247,43 @@ if ($mode == 'overwrite')
 	if ($action == 'edit' || empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION)) $disablededit = ' disabled';
 
 	print '<div class="justify"><span class="opacitymedium">';
-    print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
-    $urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
-    print ' ('.$langs->trans("SeeAlso", '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>').')<br>';
-    print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
-    print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
-    print '</span></div>';
+	print img_info().' '.$langs->trans("SomeTranslationAreUncomplete");
+	$urlwikitranslatordoc = 'https://wiki.dolibarr.org/index.php/Translator_documentation';
+	print ' ('.$langs->trans("SeeAlso", '<a href="'.$urlwikitranslatordoc.'" target="_blank">'.$langs->trans("Here").'</a>').')<br>';
+	print $langs->trans("TranslationOverwriteDesc", $langs->transnoentitiesnoconv("Language"), $langs->transnoentitiesnoconv("Key"), $langs->transnoentitiesnoconv("NewTranslationStringToShow"))."\n";
+	print ' ('.$langs->trans("TranslationOverwriteDesc2").').'."<br>\n";
+	print '</span></div>';
 
-    print '<br>';
+	print '<br>';
 
 
 	print '<input type="hidden" name="action" value="'.($action == 'edit' ? 'update' : 'add').'">';
-    print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
-    print '<td align="center"></td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("NewTranslationStringToShow", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
+	//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
+	print '<td align="center"></td>';
+	print "</tr>\n";
 
 
-    // Line to add new record
-    print "\n";
+	// Line to add new record
+	print "\n";
 
-    print '<tr class="oddeven"><td>';
-    print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidthonsmartphone', 1);
-    print '</td>'."\n";
-    print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey) ? $transkey : "").'">';
-    print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" id="transvalue" value="'.(!empty($transvalue) ? $transvalue : "").'">';
-    print '</td>';
-    // Limit to superadmin
-    /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+	print '<tr class="oddeven"><td>';
+	print $formadmin->select_language(GETPOST('langcode'), 'langcode', 0, null, 1, 0, $disablededit ? 1 : 0, 'maxwidthonsmartphone', 1);
+	print '</td>'."\n";
+	print '<td>';
+	print '<input type="text" class="flat maxwidthonsmartphone"'.$disablededit.' name="transkey" id="transkey" value="'.(!empty($transkey) ? $transkey : "").'">';
+	print '</td><td>';
+	print '<input type="text" class="quatrevingtpercent"'.$disablededit.' name="transvalue" id="transvalue" value="'.(!empty($transvalue) ? $transvalue : "").'">';
+	print '</td>';
+	// Limit to superadmin
+	/*if (! empty($conf->multicompany->enabled) && !$user->entity)
     {
     	print '<td>';
     	print '<input type="text" class="flat" size="1" name="entity" value="'.$conf->entity.'">';
@@ -292,118 +292,118 @@ if ($mode == 'overwrite')
     }
     else
     {*/
-    	print '<td class="center">';
-    	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-    //}
-    print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
-    print "</td>\n";
-    print '</tr>';
+		print '<td class="center">';
+		print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
+	//}
+	print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
+	print "</td>\n";
+	print '</tr>';
 
 
-    // Show constants
-    $sql = "SELECT rowid, entity, lang, transkey, transvalue";
-    $sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-    $sql .= " WHERE 1 = 1";
-    $sql .= " AND entity IN (".getEntity('overwrite_trans').")";
-    $sql .= $db->order($sortfield, $sortorder);
+	// Show constants
+	$sql = "SELECT rowid, entity, lang, transkey, transvalue";
+	$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+	$sql .= " WHERE 1 = 1";
+	$sql .= " AND entity IN (".getEntity('overwrite_trans').")";
+	$sql .= $db->order($sortfield, $sortorder);
 
-    dol_syslog("translation::select from table", LOG_DEBUG);
-    $result = $db->query($sql);
-    if ($result)
-    {
-    	$num = $db->num_rows($result);
-    	$i = 0;
+	dol_syslog("translation::select from table", LOG_DEBUG);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$num = $db->num_rows($result);
+		$i = 0;
 
-    	while ($i < $num)
-    	{
-    		$obj = $db->fetch_object($result);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($result);
 
-    		print "\n";
+			print "\n";
 
-    		print '<tr class="oddeven">';
+			print '<tr class="oddeven">';
 
-    		print '<td>'.$obj->lang.'</td>'."\n";
-    		print '<td>'.$obj->transkey.'</td>'."\n";
+			print '<td>'.$obj->lang.'</td>'."\n";
+			print '<td>'.$obj->transkey.'</td>'."\n";
 
-    		// Value
-    		print '<td>';
-    		/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
+			// Value
+			print '<td>';
+			/*print '<input type="hidden" name="const['.$i.'][rowid]" value="'.$obj->rowid.'">';
     		print '<input type="hidden" name="const['.$i.'][lang]" value="'.$obj->lang.'">';
     		print '<input type="hidden" name="const['.$i.'][name]" value="'.$obj->transkey.'">';
     		print '<input type="text" id="value_'.$i.'" class="flat inputforupdate" size="30" name="const['.$i.'][value]" value="'.dol_escape_htmltag($obj->transvalue).'">';
     		*/
-    		if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
-    		{
-    			print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
-    		} else {
-    			print dol_escape_htmltag($obj->transvalue);
-    		}
-    		print '</td>';
+			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
+			{
+				print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
+			} else {
+				print dol_escape_htmltag($obj->transvalue);
+			}
+			print '</td>';
 
-    		print '<td class="center">';
-    		if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
-    		{
-    			print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
-    			print '<input type="submit" class="button buttongen" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-    			print ' &nbsp; ';
-    			print '<input type="submit" class="button buttongen" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-    		} else {
-    			print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+			print '<td class="center">';
+			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int'))
+			{
+				print '<input type="hidden" class="button" name="rowid" value="'.$obj->rowid.'">';
+				print '<input type="submit" class="button buttongen" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print ' &nbsp; ';
-    			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
-    		}
-    		print '</td>';
+				print '<input type="submit" class="button buttongen" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+			} else {
+				print '<a class="reposition editfielda paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=edit'.((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_edit().'</a>';
+				print ' &nbsp; ';
+				print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$obj->entity.'&action=delete&token='.newToken().((empty($user->entity) && $debug) ? '&debug=1' : '').'">'.img_delete().'</a>';
+			}
+			print '</td>';
 
-    		print "</tr>\n";
-    		print "\n";
-    		$i++;
-    	}
-    }
+			print "</tr>\n";
+			print "\n";
+			$i++;
+		}
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 if ($mode == 'searchkey')
 {
-    $langcode = GETPOST('langcode') ?GETPOST('langcode') : $langs->defaultlang;
+	$langcode = GETPOST('langcode') ?GETPOST('langcode') : $langs->defaultlang;
 
-    $newlang = new Translate('', $conf);
-    $newlang->setDefaultLang($langcode);
+	$newlang = new Translate('', $conf);
+	$newlang->setDefaultLang($langcode);
 
-    $newlangfileonly = new Translate('', $conf);
-    $newlangfileonly->setDefaultLang($langcode);
+	$newlangfileonly = new Translate('', $conf);
+	$newlangfileonly->setDefaultLang($langcode);
 
-    $recordtoshow = array();
+	$recordtoshow = array();
 
-    // Search modules dirs
-    $modulesdir = dolGetModulesDirs();
+	// Search modules dirs
+	$modulesdir = dolGetModulesDirs();
 
-    $nbtotaloffiles = 0;
-    $nbempty = 0;
-    /*var_dump($langcode);
+	$nbtotaloffiles = 0;
+	$nbempty = 0;
+	/*var_dump($langcode);
      var_dump($transkey);
      var_dump($transvalue);*/
-    if (empty($langcode) || $langcode == '-1') $nbempty++;
-    if (empty($transkey)) $nbempty++;
-    if (empty($transvalue)) $nbempty++;
-    if ($action == 'search' && ($nbempty > 999))    // 999 to disable this
-    {
-        setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
-    } else {
-        // Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
-        $i = 0;
-        foreach ($modulesdir as $keydir => $tmpsearchdir)
-        {
-        	$searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
+	if (empty($langcode) || $langcode == '-1') $nbempty++;
+	if (empty($transkey)) $nbempty++;
+	if (empty($transvalue)) $nbempty++;
+	if ($action == 'search' && ($nbempty > 999))    // 999 to disable this
+	{
+		setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
+	} else {
+		// Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
+		$i = 0;
+		foreach ($modulesdir as $keydir => $tmpsearchdir)
+		{
+			$searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
 
-        	// Directory of translation files
-        	$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
-        	$dir_lang_osencoded = dol_osencode($dir_lang);
+			// Directory of translation files
+			$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
+			$dir_lang_osencoded = dol_osencode($dir_lang);
 
-        	$filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
-        	foreach ($filearray as $file)
-        	{
+			$filearray = dol_dir_list($dir_lang_osencoded, 'files', 0, '', '', $sortfield, (strtolower($sortorder) == 'asc' ?SORT_ASC:SORT_DESC), 1);
+			foreach ($filearray as $file)
+			{
 				$tmpfile = preg_replace('/.lang/i', '', basename($file['name']));
 				$moduledirname = (basename(dirname(dirname($dir_lang))));
 
@@ -416,135 +416,135 @@ if ($mode == 'searchkey')
 				if ($result < 0) print 'Failed to load language file '.$tmpfile.'<br>'."\n";
 				else $nbtotaloffiles++;
 				//print 'After loading lang '.$langkey.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
-        	}
-        	$i++;
-        }
+			}
+			$i++;
+		}
 
-        // Now search into translation array
-        foreach ($newlang->tab_translate as $key => $val)
-        {
-            if ($transkey && !preg_match('/'.preg_quote($transkey, '/').'/i', $key)) continue;
-            if ($transvalue && !preg_match('/'.preg_quote($transvalue, '/').'/i', $val)) continue;
-            $recordtoshow[$key] = $val;
-        }
-    }
+		// Now search into translation array
+		foreach ($newlang->tab_translate as $key => $val)
+		{
+			if ($transkey && !preg_match('/'.preg_quote($transkey, '/').'/i', $key)) continue;
+			if ($transvalue && !preg_match('/'.preg_quote($transvalue, '/').'/i', $val)) continue;
+			$recordtoshow[$key] = $val;
+		}
+	}
 
-    //print '<br>';
-    $nbtotalofrecordswithoutfilters = count($newlang->tab_translate);
-    $nbtotalofrecords = count($recordtoshow);
-    $num = $limit + 1;
-    if (($offset + $num) > $nbtotalofrecords) $num = $limit;
+	//print '<br>';
+	$nbtotalofrecordswithoutfilters = count($newlang->tab_translate);
+	$nbtotalofrecords = count($recordtoshow);
+	$num = $limit + 1;
+	if (($offset + $num) > $nbtotalofrecords) $num = $limit;
 
-    //print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
-    $title = $langs->trans("TranslationKeySearch");
-    if ($nbtotalofrecords > 0) $title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
-    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+	//print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
+	$title = $langs->trans("TranslationKeySearch");
+	if ($nbtotalofrecords > 0) $title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
-    print '<input type="hidden" id="action" name="action" value="search">';
-    print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
+	print '<input type="hidden" id="action" name="action" value="search">';
+	print '<input type="hidden" id="mode" name="mode" value="'.$mode.'">';
 
 	print '<div class="div-table-responsive-no-min">';
-    print '<table class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
-    //if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
-    print '<td align="center"></td>';
-    print "</tr>\n";
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Language_en_US_es_MX_etc", $_SERVER["PHP_SELF"], 'lang,transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Key", $_SERVER["PHP_SELF"], 'transkey', '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("CurrentTranslationString", $_SERVER["PHP_SELF"], 'transvalue', '', $param, '', $sortfield, $sortorder);
+	//if (! empty($conf->multicompany->enabled) && !$user->entity) print_liste_field_titre("Entity", $_SERVER["PHP_SELF"], 'entity,transkey', '', $param, '', $sortfield, $sortorder);
+	print '<td align="center"></td>';
+	print "</tr>\n";
 
-    // Line to search new record
-    print "\n";
+	// Line to search new record
+	print "\n";
 
-    print '<tr class="oddeven"><td>';
-    //print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
-    print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
-    print '</td>'."\n";
-    print '<td>';
-    print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
-    print '</td><td>';
-    print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
-    // Limit to superadmin
-    /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+	print '<tr class="oddeven"><td>';
+	//print $formadmin->select_language($langcode,'langcode',0,null,$langs->trans("All"),0,0,'',1);
+	print $formadmin->select_language($langcode, 'langcode', 0, null, 0, 0, 0, 'maxwidthonsmartphone', 1);
+	print '</td>'."\n";
+	print '<td>';
+	print '<input type="text" class="flat maxwidthonsmartphone" name="transkey" value="'.$transkey.'">';
+	print '</td><td>';
+	print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.$transvalue.'">';
+	// Limit to superadmin
+	/*if (! empty($conf->multicompany->enabled) && !$user->entity)
     {
         print '</td><td>';
         print '<input type="text" class="flat" size="1" name="entitysearch" value="'.$conf->entity.'">';
     }
     else
     {*/
-        print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
-    //}
-    print '</td>';
-    // Action column
-    print '<td class="nowrap right">';
-    $searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
-    print $searchpicto;
-    print '</td>';
-    print '</tr>';
+		print '<input type="hidden" name="entitysearch" value="'.$conf->entity.'">';
+	//}
+	print '</td>';
+	// Action column
+	print '<td class="nowrap right">';
+	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
+	print $searchpicto;
+	print '</td>';
+	print '</tr>';
 
-    if ($sortfield == 'transkey' && strtolower($sortorder) == 'asc') ksort($recordtoshow);
-    if ($sortfield == 'transkey' && strtolower($sortorder) == 'desc') krsort($recordtoshow);
-    if ($sortfield == 'transvalue' && strtolower($sortorder) == 'asc') asort($recordtoshow);
-    if ($sortfield == 'transvalue' && strtolower($sortorder) == 'desc') arsort($recordtoshow);
+	if ($sortfield == 'transkey' && strtolower($sortorder) == 'asc') ksort($recordtoshow);
+	if ($sortfield == 'transkey' && strtolower($sortorder) == 'desc') krsort($recordtoshow);
+	if ($sortfield == 'transvalue' && strtolower($sortorder) == 'asc') asort($recordtoshow);
+	if ($sortfield == 'transvalue' && strtolower($sortorder) == 'desc') arsort($recordtoshow);
 
-    // Show result
-    $i = 0;
-    foreach ($recordtoshow as $key => $val)
-    {
-        $i++;
-        if ($i <= $offset) continue;
-        if ($i > ($offset + $limit)) break;
-        print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
-        print dol_escape_htmltag($val);
-        print '</td><td class="right nowraponall">';
-        if (!empty($newlangfileonly->tab_translate[$key]))
-        {
-            if ($val != $newlangfileonly->tab_translate[$key])
-            {
-                // retrieve rowid
-                $sql = "SELECT rowid";
-                $sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
-                $sql .= " WHERE transkey = '".$key."'";
-                $sql .= " AND entity IN (".getEntity('overwrite_trans').")";
-                dol_syslog("translation::select from table", LOG_DEBUG);
-                $result = $db->query($sql);
-                if ($result)
-                {
-                    $obj = $db->fetch_object($result);
-                }
-                print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
-                print ' ';
-                print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
-                print '&nbsp;&nbsp;';
-                $htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
-                print $form->textwithpicto('', $htmltext, 1, 'info');
-            } elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
-            {
-            	//print $key.'-'.$val;
-                print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
-            }
+	// Show result
+	$i = 0;
+	foreach ($recordtoshow as $key => $val)
+	{
+		$i++;
+		if ($i <= $offset) continue;
+		if ($i > ($offset + $limit)) break;
+		print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td>';
+		print dol_escape_htmltag($val);
+		print '</td><td class="right nowraponall">';
+		if (!empty($newlangfileonly->tab_translate[$key]))
+		{
+			if ($val != $newlangfileonly->tab_translate[$key])
+			{
+				// retrieve rowid
+				$sql = "SELECT rowid";
+				$sql .= " FROM ".MAIN_DB_PREFIX."overwrite_trans";
+				$sql .= " WHERE transkey = '".$key."'";
+				$sql .= " AND entity IN (".getEntity('overwrite_trans').")";
+				dol_syslog("translation::select from table", LOG_DEBUG);
+				$result = $db->query($sql);
+				if ($result)
+				{
+					$obj = $db->fetch_object($result);
+				}
+				print '<a class="editfielda reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=edit">'.img_edit().'</a>';
+				print ' ';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?rowid='.$obj->rowid.'&entity='.$conf->entity.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
+				print '&nbsp;&nbsp;';
+				$htmltext = $langs->trans("OriginalValueWas", '<i>'.$newlangfileonly->tab_translate[$key].'</i>');
+				print $form->textwithpicto('', $htmltext, 1, 'info');
+			} elseif (!empty($conf->global->MAIN_ENABLE_OVERWRITE_TRANSLATION))
+			{
+				//print $key.'-'.$val;
+				print '<a class="reposition paddingrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=overwrite&amp;langcode='.$langcode.'&amp;transkey='.$key.'">'.img_edit_add($langs->trans("Overwrite")).'</a>';
+			}
 
-            if (!empty($conf->global->MAIN_FEATURES_LEVEL))
-            {
-            	$transifexlangfile = '$'; // $ means 'All'
-            	//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
-            	$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
+			if (!empty($conf->global->MAIN_FEATURES_LEVEL))
+			{
+				$transifexlangfile = '$'; // $ means 'All'
+				//$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?key='.$key;
+				$transifexurl = 'https://www.transifex.com/dolibarr-association/dolibarr/translate/#'.$langcode.'/'.$transifexlangfile.'?q=key%3A'.$key;
 
-            	print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto($langs->trans('FixOnTransifex'), 'globe').'</a>';
-            }
-        } else {
-            $htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
-            print $form->textwithpicto('', $htmltext, 1, 'warning');
-        }
-        /*if (! empty($conf->multicompany->enabled) && !$user->entity)
+				print ' &nbsp; <a href="'.$transifexurl.'" target="transifex">'.img_picto($langs->trans('FixOnTransifex'), 'globe').'</a>';
+			}
+		} else {
+			$htmltext = $langs->trans("TransKeyWithoutOriginalValue", $key);
+			print $form->textwithpicto('', $htmltext, 1, 'warning');
+		}
+		/*if (! empty($conf->multicompany->enabled) && !$user->entity)
         {
             print '<td>'.$val.'</td>';
         }*/
-        print '</td></tr>'."\n";
-    }
+		print '</td></tr>'."\n";
+	}
 
-    print '</table>';
-    print '</div>';
+	print '</table>';
+	print '</div>';
 }
 
 dol_fiche_end();
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index b8520ecc227..19d71ebb1d9 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -124,252 +124,252 @@ $sourceList = array();
 // Actions add or modify a website
 if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha'))
 {
-    $listfield = explode(',', $tabfield[$id]);
-    $listfieldinsert = explode(',', $tabfieldinsert[$id]);
-    $listfieldmodify = explode(',', $tabfieldinsert[$id]);
-    $listfieldvalue = explode(',', $tabfieldvalue[$id]);
+	$listfield = explode(',', $tabfield[$id]);
+	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-    // Check that all fields are filled
-    $ok = 1;
-    foreach ($listfield as $f => $value)
-    {
-    	if ($value == 'ref' && (!GETPOSTISSET($value) || GETPOST($value) == ''))
-	    {
-    	    $ok = 0;
-        	$fieldnamekey = $listfield[$f];
-	        setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
-	        break;
-    	} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
-	    {
+	// Check that all fields are filled
+	$ok = 1;
+	foreach ($listfield as $f => $value)
+	{
+		if ($value == 'ref' && (!GETPOSTISSET($value) || GETPOST($value) == ''))
+		{
 			$ok = 0;
-    	    $fieldnamekey = $listfield[$f];
+			$fieldnamekey = $listfield[$f];
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+			break;
+		} elseif ($value == 'ref' && !preg_match('/^[a-z0-9_\-\.]+$/i', $_POST[$value]))
+		{
+			$ok = 0;
+			$fieldnamekey = $listfield[$f];
 			setEventMessages($langs->transnoentities("ErrorFieldCanNotContainSpecialCharacters", $langs->transnoentities($fieldnamekey)), null, 'errors');
 			break;
-	    }
-    }
+		}
+	}
 
-    // Clean parameters
-    if (!empty($_POST['ref']))
-    {
-    	$websitekey = strtolower($_POST['ref']);
-    }
+	// Clean parameters
+	if (!empty($_POST['ref']))
+	{
+		$websitekey = strtolower($_POST['ref']);
+	}
 
-    // Si verif ok et action add, on ajoute la ligne
-    if ($ok && GETPOST('actionadd', 'alpha'))
-    {
-        if ($tabrowid[$id])
-        {
-            // Recupere id libre pour insertion
-            $newid = 0;
-            $sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-            $result = $db->query($sql);
-            if ($result)
-            {
-                $obj = $db->fetch_object($result);
-                $newid = ($obj->newid + 1);
-            } else {
-                dol_print_error($db);
-            }
-        }
+	// Si verif ok et action add, on ajoute la ligne
+	if ($ok && GETPOST('actionadd', 'alpha'))
+	{
+		if ($tabrowid[$id])
+		{
+			// Recupere id libre pour insertion
+			$newid = 0;
+			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
+			$result = $db->query($sql);
+			if ($result)
+			{
+				$obj = $db->fetch_object($result);
+				$newid = ($obj->newid + 1);
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-        /* $website=new Website($db);
+		/* $website=new Website($db);
         $website->ref=
         $website->description=
         $website->virtualhost=
         $website->create($user); */
 
-        // Add new entry
-        $sql = "INSERT INTO ".$tabname[$id]." (";
-        // List of fields
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $tabrowid[$id].",";
-        $sql .= $tabfieldinsert[$id];
-        $sql .= ",status)";
-        $sql .= " VALUES(";
+		// Add new entry
+		$sql = "INSERT INTO ".$tabname[$id]." (";
+		// List of fields
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $tabrowid[$id].",";
+		$sql .= $tabfieldinsert[$id];
+		$sql .= ",status)";
+		$sql .= " VALUES(";
 
-        // List of values
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
-        	$sql .= $newid.",";
-        $i = 0;
-        foreach ($listfieldinsert as $f => $value)
-        {
-            if ($value == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($value == 'ref') {
-            	$_POST[$listfieldvalue[$i]] = strtolower($_POST[$listfieldvalue[$i]]);
-            }
-            if ($i) $sql .= ",";
-            if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= ",1)";
+		// List of values
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert))
+			$sql .= $newid.",";
+		$i = 0;
+		foreach ($listfieldinsert as $f => $value)
+		{
+			if ($value == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($value == 'ref') {
+				$_POST[$listfieldvalue[$i]] = strtolower($_POST[$listfieldvalue[$i]]);
+			}
+			if ($i) $sql .= ",";
+			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= ",1)";
 
-        dol_syslog("actionadd", LOG_DEBUG);
-        $result = $db->query($sql);
-        if ($result)	// Add is ok
-        {
-            setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-        	unset($_POST); // Clean $_POST array, we keep only
-        } else {
-            if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-                setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
-            } else {
-                dol_print_error($db);
-            }
-        }
-    }
+		dol_syslog("actionadd", LOG_DEBUG);
+		$result = $db->query($sql);
+		if ($result)	// Add is ok
+		{
+			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
+			unset($_POST); // Clean $_POST array, we keep only
+		} else {
+			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
+	}
 
-    // Si verif ok et action modify, on modifie la ligne
-    if ($ok && GETPOST('actionmodify', 'alpha'))
-    {
-        if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	// Si verif ok et action modify, on modifie la ligne
+	if ($ok && GETPOST('actionmodify', 'alpha'))
+	{
+		if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-        $db->begin();
+		$db->begin();
 
-        $website = new Website($db);
-        $rowid = GETPOST('rowid', 'int');
-        $website->fetch($rowid);
+		$website = new Website($db);
+		$rowid = GETPOST('rowid', 'int');
+		$website->fetch($rowid);
 
-        // Modify entry
-        $sql = "UPDATE ".$tabname[$id]." SET ";
-        // Modifie valeur des champs
-        if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
-        {
-            $sql .= $tabrowid[$id]."=";
-            $sql .= "'".$db->escape($rowid)."', ";
-        }
-        $i = 0;
-        foreach ($listfieldmodify as $field)
-        {
-            if ($field == 'entity') {
-            	$_POST[$listfieldvalue[$i]] = $conf->entity;
-            }
-            if ($i) $sql .= ",";
-            $sql .= $field."=";
-            if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
-            else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-            $i++;
-        }
-        $sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+		// Modify entry
+		$sql = "UPDATE ".$tabname[$id]." SET ";
+		// Modifie valeur des champs
+		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify))
+		{
+			$sql .= $tabrowid[$id]."=";
+			$sql .= "'".$db->escape($rowid)."', ";
+		}
+		$i = 0;
+		foreach ($listfieldmodify as $field)
+		{
+			if ($field == 'entity') {
+				$_POST[$listfieldvalue[$i]] = $conf->entity;
+			}
+			if ($i) $sql .= ",";
+			$sql .= $field."=";
+			if ($_POST[$listfieldvalue[$i]] == '') $sql .= "null";
+			else $sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+			$i++;
+		}
+		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
 
-        dol_syslog("actionmodify", LOG_DEBUG);
-        //print $sql;
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-            $newname = dol_sanitizeFileName(GETPOST('ref', 'aZ09'));
-            if ($newname != $website->ref)
-            {
-	            $srcfile = DOL_DATA_ROOT.'/website/'.$website->ref;
-	            $destfile = DOL_DATA_ROOT.'/website/'.$newname;
+		dol_syslog("actionmodify", LOG_DEBUG);
+		//print $sql;
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$newname = dol_sanitizeFileName(GETPOST('ref', 'aZ09'));
+			if ($newname != $website->ref)
+			{
+				$srcfile = DOL_DATA_ROOT.'/website/'.$website->ref;
+				$destfile = DOL_DATA_ROOT.'/website/'.$newname;
 
-            	if (dol_is_dir($destfile))
-            	{
-            		$error++;
-            		setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
-            	} else {
-	                @rename($srcfile, $destfile);
+				if (dol_is_dir($destfile))
+				{
+					$error++;
+					setEventMessages($langs->trans('ErrorDirAlreadyExists', $destfile), null, 'errors');
+				} else {
+					@rename($srcfile, $destfile);
 
-		            // We must now rename $website->ref into $newname inside files
-		            $arrayreplacement = array($website->ref.'/htmlheader.html' => $newname.'/htmlheader.html');
-		            $listofilestochange = dol_dir_list($destfile, 'files', 0, '\.php$');
+					// We must now rename $website->ref into $newname inside files
+					$arrayreplacement = array($website->ref.'/htmlheader.html' => $newname.'/htmlheader.html');
+					$listofilestochange = dol_dir_list($destfile, 'files', 0, '\.php$');
 					foreach ($listofilestochange as $key => $value)
-		            {
-		            	dolReplaceInFile($value['fullname'], $arrayreplacement);
-		            }
-            	}
-            }
-        } else {
-        	$error++;
-            setEventMessages($db->lasterror(), null, 'errors');
-        }
+					{
+						dolReplaceInFile($value['fullname'], $arrayreplacement);
+					}
+				}
+			}
+		} else {
+			$error++;
+			setEventMessages($db->lasterror(), null, 'errors');
+		}
 
-        if (!$error)
-        {
-        	$db->commit();
-        } else {
-        	$db->rollback();
-        }
-    }
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if (GETPOST('actioncancel', 'alpha'))
 {
-    //$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
+	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes')       // delete
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    $website = new Website($db);
-    $website->fetch($rowid);
+	$website = new Website($db);
+	$website->fetch($rowid);
 
-    if ($website->id > 0)
-    {
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_account WHERE fk_website = ".((int) $rowid);
-    	$result = $db->query($sql);
+	if ($website->id > 0)
+	{
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_account WHERE fk_website = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_page WHERE fk_website = ".((int) $rowid);
-    	$result = $db->query($sql);
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_page WHERE fk_website = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website_extrafields WHERE fk_object = ".((int) $rowid);
-    	$result = $db->query($sql);
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website_extrafields WHERE fk_object = ".((int) $rowid);
+		$result = $db->query($sql);
 
-    	$sql = "DELETE from ".MAIN_DB_PREFIX."website WHERE rowid = ".((int) $rowid);
-	    $result = $db->query($sql);
-	    if (!$result)
-	    {
-	        if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
-	        {
-	            setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
-	        } else {
-	            dol_print_error($db);
-	        }
-	    }
+		$sql = "DELETE from ".MAIN_DB_PREFIX."website WHERE rowid = ".((int) $rowid);
+		$result = $db->query($sql);
+		if (!$result)
+		{
+			if ($db->errno() == 'DB_ERROR_CHILD_EXISTS')
+			{
+				setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+			} else {
+				dol_print_error($db);
+			}
+		}
 
-	    if ($website->ref)
-	    {
-	    	dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
-	    }
-    } else {
-    	dol_print_error($db, 'Failed to load website with id '.$rowid);
-    }
+		if ($website->ref)
+		{
+			dol_delete_dir_recursive($conf->website->dir_output.'/'.$website->ref);
+		}
+	} else {
+		dol_print_error($db, 'Failed to load website with id '.$rowid);
+	}
 }
 
 // activate
 if ($action == $acts[0])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid = ".((int) $rowid);
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET status = 1 WHERE rowid = ".((int) $rowid);
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 // disable
 if ($action == $acts[1])
 {
-    if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
+	if ($tabrowid[$id]) { $rowidcol = $tabrowid[$id]; } else { $rowidcol = "rowid"; }
 
-    if ($rowid) {
-        $sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid = ".((int) $rowid);
-    }
+	if ($rowid) {
+		$sql = "UPDATE ".$tabname[$id]." SET status = 0 WHERE rowid = ".((int) $rowid);
+	}
 
-    $result = $db->query($sql);
-    if (!$result)
-    {
-        dol_print_error($db);
-    }
+	$result = $db->query($sql);
+	if (!$result)
+	{
+		dol_print_error($db);
+	}
 }
 
 
@@ -411,7 +411,7 @@ print "<br>\n";
 // Confirmation de la suppression de la ligne
 if ($action == 'delete')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete', '', 0, 1, 220);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid, $langs->trans('DeleteWebsite'), $langs->trans('ConfirmDeleteWebsite'), 'confirm_delete', '', 0, 1, 220);
 }
 //var_dump($elementList);
 
@@ -420,205 +420,205 @@ if ($action == 'delete')
  */
 if ($id)
 {
-    // Complete requete recherche valeurs avec critere de tri
-    $sql = $tabsql[$id];
-    $sql .= $db->order($sortfield, $sortorder);
-    $sql .= $db->plimit($limit + 1, $offset);
-    //print $sql;
+	// Complete requete recherche valeurs avec critere de tri
+	$sql = $tabsql[$id];
+	$sql .= $db->order($sortfield, $sortorder);
+	$sql .= $db->plimit($limit + 1, $offset);
+	//print $sql;
 
-    $fieldlist = explode(',', $tabfield[$id]);
+	$fieldlist = explode(',', $tabfield[$id]);
 
-    print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<table class="noborder centpercent">';
+	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<table class="noborder centpercent">';
 
-    // Form to add a new line
-    if ($tabname[$id])
-    {
-        $alabelisused = 0;
-        $var = false;
+	// Form to add a new line
+	if ($tabname[$id])
+	{
+		$alabelisused = 0;
+		$var = false;
 
-        $fieldlist = explode(',', $tabfield[$id]);
+		$fieldlist = explode(',', $tabfield[$id]);
 
-        // Line for title
-        print '<tr class="liste_titre">';
-        foreach ($fieldlist as $field => $value)
-        {
-            // Determine le nom du champ par rapport aux noms possibles
-            // dans les dictionnaires de donnees
-            $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-            $valuetoshow = $langs->trans($valuetoshow); // try to translate
-            $align = '';
-            if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-            if ($valuetoshow != '')
-            {
-                print '<td class="'.$align.'">';
-            	if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-            	elseif (!empty($tabhelp[$id][$value]))
-           		{
-           			if ($value == 'virtualhost') print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
-           			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
-           		} else print $valuetoshow;
-                print '</td>';
-            }
-            if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
-        }
+		// Line for title
+		print '<tr class="liste_titre">';
+		foreach ($fieldlist as $field => $value)
+		{
+			// Determine le nom du champ par rapport aux noms possibles
+			// dans les dictionnaires de donnees
+			$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+			$valuetoshow = $langs->trans($valuetoshow); // try to translate
+			$align = '';
+			if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+			if ($valuetoshow != '')
+			{
+				print '<td class="'.$align.'">';
+				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) print '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				elseif (!empty($tabhelp[$id][$value]))
+		   		{
+		   			if ($value == 'virtualhost') print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltipvirtual');
+		   			else print $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+		   		} else print $valuetoshow;
+				print '</td>';
+			}
+			if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') $alabelisused = 1;
+		}
 
-        print '<td colspan="4">';
-        print '</td>';
-        print '</tr>';
+		print '<td colspan="4">';
+		print '</td>';
+		print '</tr>';
 
-        // Line to enter new values
-        print "<tr ".$bcnd[$var].">";
+		// Line to enter new values
+		print "<tr ".$bcnd[$var].">";
 
-        $obj = new stdClass();
-        // If data was already input, we define them in obj to populate input fields.
-        if (GETPOST('actionadd', 'alpha'))
-        {
-            foreach ($fieldlist as $key=>$val)
-            {
-                if (GETPOST($val, 'alpha'))
-                	$obj->$val = GETPOST($val);
-            }
-        }
+		$obj = new stdClass();
+		// If data was already input, we define them in obj to populate input fields.
+		if (GETPOST('actionadd', 'alpha'))
+		{
+			foreach ($fieldlist as $key=>$val)
+			{
+				if (GETPOST($val, 'alpha'))
+					$obj->$val = GETPOST($val);
+			}
+		}
 
-        fieldListWebsites($fieldlist, $obj, $tabname[$id], 'add');
+		fieldListWebsites($fieldlist, $obj, $tabname[$id], 'add');
 
-        print '<td colspan="3" class="right">';
-        if ($action != 'edit')
-        {
-        	print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
-        }
-        print '</td>';
-        print "</tr>";
+		print '<td colspan="3" class="right">';
+		if ($action != 'edit')
+		{
+			print '<input type="submit" class="button" name="actionadd" value="'.$langs->trans("Add").'">';
+		}
+		print '</td>';
+		print "</tr>";
 
-        $colspan = count($fieldlist) + 2;
-    }
+		$colspan = count($fieldlist) + 2;
+	}
 
-    print '</table>';
-    print '</form>';
+	print '</table>';
+	print '</form>';
 
 
-    // List of websites in database
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-        if ($num)
-        {
-            print '<br>';
+	// List of websites in database
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+		if ($num)
+		{
+			print '<br>';
 
-            print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="page" value="'.$page.'">';
-            print '<input type="hidden" name="rowid" value="'.$rowid.'">';
+			print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="page" value="'.$page.'">';
+			print '<input type="hidden" name="rowid" value="'.$rowid.'">';
 
-            print '<table class="noborder centpercent">';
+			print '<table class="noborder centpercent">';
 
-            // Title of lines
-            print '<tr class="liste_titre">';
-            foreach ($fieldlist as $field => $value)
-            {
-                // Determine le nom du champ par rapport aux noms possibles
-                // dans les dictionnaires de donnees
-                $showfield = 1; // Par defaut
-                $align = "left";
-                $sortable = 1;
-                $valuetoshow = '';
-                /*
+			// Title of lines
+			print '<tr class="liste_titre">';
+			foreach ($fieldlist as $field => $value)
+			{
+				// Determine le nom du champ par rapport aux noms possibles
+				// dans les dictionnaires de donnees
+				$showfield = 1; // Par defaut
+				$align = "left";
+				$sortable = 1;
+				$valuetoshow = '';
+				/*
                 $tmparray=getLabelOfField($fieldlist[$field]);
                 $showfield=$tmp['showfield'];
                 $valuetoshow=$tmp['valuetoshow'];
                 $align=$tmp['align'];
                 $sortable=$tmp['sortable'];
 				*/
-                $valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
-                $valuetoshow = $langs->trans($valuetoshow); // try to translate
-                if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
-                if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
-                if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
+				$valuetoshow = ucfirst($fieldlist[$field]); // Par defaut
+				$valuetoshow = $langs->trans($valuetoshow); // try to translate
+				if ($fieldlist[$field] == 'lang') { $valuetoshow = $langs->trans("Language"); }
+				if ($fieldlist[$field] == 'type') { $valuetoshow = $langs->trans("Type"); }
+				if ($fieldlist[$field] == 'code') { $valuetoshow = $langs->trans("Code"); }
 
-                // Affiche nom du champ
-                if ($showfield)
-                {
-                    print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
-                }
-            }
+				// Affiche nom du champ
+				if ($showfield)
+				{
+					print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), "", "align=".$align, $sortfield, $sortorder);
+				}
+			}
 
 			print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "status", ($page ? 'page='.$page.'&' : ''), "", 'align="center"', $sortfield, $sortorder);
-            print getTitleFieldOfList('');
-            print getTitleFieldOfList('');
-            print '</tr>';
+			print getTitleFieldOfList('');
+			print getTitleFieldOfList('');
+			print '</tr>';
 
-            // Lines with values
-            while ($i < $num)
-            {
-                $obj = $db->fetch_object($resql);
-                //print_r($obj);
-                print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
-                if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
-                {
-                    $tmpaction = 'edit';
-                    $parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('editWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+			// Lines with values
+			while ($i < $num)
+			{
+				$obj = $db->fetch_object($resql);
+				//print_r($obj);
+				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
+				if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code)))
+				{
+					$tmpaction = 'edit';
+					$parameters = array('fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('editWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook)) fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
+					if (empty($reshook)) fieldListWebsites($fieldlist, $obj, $tabname[$id], 'edit');
 
-                    print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
-                    print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
-                } else {
-	              	$tmpaction = 'view';
-                    $parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
-                    $reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
+					print '<td colspan="3" class="right"><a name="'.(!empty($obj->rowid) ? $obj->rowid : $obj->code).'">&nbsp;</a><input type="submit" class="button" name="actionmodify" value="'.$langs->trans("Modify").'">';
+					print '&nbsp;<input type="submit" class="button" name="actioncancel" value="'.$langs->trans("Cancel").'"></td>';
+				} else {
+				  	$tmpaction = 'view';
+					$parameters = array('var'=>$var, 'fieldlist'=>$fieldlist, 'tabname'=>$tabname[$id]);
+					$reshook = $hookmanager->executeHooks('viewWebsiteFieldlist', $parameters, $obj, $tmpaction); // Note that $action and $object may have been modified by some hooks
 
-                    $error = $hookmanager->error; $errors = $hookmanager->errors;
+					$error = $hookmanager->error; $errors = $hookmanager->errors;
 
-                    if (empty($reshook))
-                    {
-                        foreach ($fieldlist as $field => $value)
-                        {
-                            $showfield = 1;
-                        	$align = "left";
-                        	$fieldname = $fieldlist[$field];
-                            $valuetoshow = $obj->$fieldname;
+					if (empty($reshook))
+					{
+						foreach ($fieldlist as $field => $value)
+						{
+							$showfield = 1;
+							$align = "left";
+							$fieldname = $fieldlist[$field];
+							$valuetoshow = $obj->$fieldname;
 
 							// Show value for field
 							if ($showfield) print '<td align="'.$align.'">'.$valuetoshow.'</td>';
-                        }
-                    }
+						}
+					}
 
-                    // Can an entry be erased or disabled ?
-                    $iserasable = 1; $isdisable = 1; // true by default
-                    if ($obj->status) $iserasable = 0; // We can't delete a website on. Disable it first.
+					// Can an entry be erased or disabled ?
+					$iserasable = 1; $isdisable = 1; // true by default
+					if ($obj->status) $iserasable = 0; // We can't delete a website on. Disable it first.
 
-                    $url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&amp;code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&amp;';
+					$url = $_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.(!empty($obj->rowid) ? $obj->rowid : (!empty($obj->code) ? $obj->code : '')).'&amp;code='.(!empty($obj->code) ?urlencode($obj->code) : '').'&amp;';
 
-                    // Active
-                    print '<td align="center" class="nowrap">';
-                    print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'">'.$actl[($obj->status ? 1 : 0)].'</a>';
-                    print "</td>";
+					// Active
+					print '<td align="center" class="nowrap">';
+					print '<a class="reposition" href="'.$url.'action='.$acts[($obj->status ? 1 : 0)].'">'.$actl[($obj->status ? 1 : 0)].'</a>';
+					print "</td>";
 
-                    // Modify link
-                    print '<td align="center"><a class="reposition" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
+					// Modify link
+					print '<td align="center"><a class="reposition" href="'.$url.'action=edit&token='.newToken().'">'.img_edit().'</a></td>';
 
-                    // Delete link
-                    if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
-                    else print '<td class="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
+					// Delete link
+					if ($iserasable) print '<td align="center"><a class="reposition" href="'.$url.'action=delete&token='.newToken().'">'.img_delete().'</a></td>';
+					else print '<td class="center">'.img_delete($langs->trans("DisableSiteFirst"), 'class="opacitymedium"').'</td>';
 
-                    print "</tr>\n";
-                }
-                $i++;
-            }
+					print "</tr>\n";
+				}
+				$i++;
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</form>';
-        }
-    } else {
-        dol_print_error($db);
-    }
+			print '</form>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 dol_fiche_end();
@@ -649,7 +649,7 @@ function fieldListWebsites($fieldlist, $obj = '', $tabname = '', $context = '')
 
 	foreach ($fieldlist as $field => $value)
 	{
-	    $fieldname = $fieldlist[$field];
+		$fieldname = $fieldlist[$field];
 		if ($fieldlist[$field] == 'lang')
 		{
 			print '<td>';
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index fbe5e7b1872..8177fbf7e1e 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -35,1865 +35,1865 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/ccountry.class.php';
  */
 class Setup extends DolibarrApi
 {
-    private $translations = null;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        global $db;
-        $this->db = $db;
-    }
-
-    /**
-     * Get the list of ordering methods.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
-     *
-     * @url     GET dictionary/ordering_methods
-     *
-     * @return array [List of ordering methods]
-     *
-     * @throws RestException 400
-     */
-    public function getOrderingMethods($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        if (!DolibarrApiAccess::$user->rights->commande->lire) {
-        	throw new RestException(401);
-        }
-
-        $sql = "SELECT rowid, code, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_input_method as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of payments types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/payment_types
-     *
-     * @return array [List of payment types]
-     *
-     * @throws RestException 400
-     */
-    public function getPaymentTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        if (!DolibarrApiAccess::$user->rights->propal->lire && !DolibarrApiAccess::$user->rights->commande->lire && !DolibarrApiAccess::$user->rights->facture->lire) {
-        	throw new RestException(401);
-        }
-
-        $sql = "SELECT id, code, type, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-              $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of states/provinces.
-     *
-     * The names of the states will be translated to the given language if
-     * the $lang parameter is provided. The value of $lang must be a language
-     * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
-     * The returned list is sorted by state ID.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $filter     To filter the countries by name
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array                List of countries
-     *
-     * @url     GET dictionary/states
-     *
-     * @throws RestException
-     */
-    public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $sqlfilters = '')
-    {
-        $list = array();
-
-        // Note: The filter is not applied in the SQL request because it must
-        // be applied to the translated names, not to the names in database.
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
-        $sql .= " WHERE 1 = 1";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $state = new Cstate($this->db);
-                if ($state->fetch($obj->rowid) > 0) {
-                    if (empty($filter) || stripos($state->label, $filter) !== false) {
-                        $list[] = $this->_cleanObjectDatas($state);
-                    }
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of states');
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get state by ID.
-     *
-     * @param int       $id        ID of state
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/states/{id}
-     *
-     * @throws RestException
-     */
-    public function getStateByID($id)
-    {
-        return $this->_fetchCstate($id, '');
-    }
-
-    /**
-     * Get state by Code.
-     *
-     * @param string    $code      Code of state
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/states/byCode/{code}
-     *
-     * @throws RestException
-     */
-    public function getStateByCode($code)
-    {
-        return $this->_fetchCstate('', $code);
-    }
-
-    /**
-     * Get the list of countries.
-     *
-     * The names of the countries will be translated to the given language if
-     * the $lang parameter is provided. The value of $lang must be a language
-     * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
-     * The returned list is sorted by country ID.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $filter     To filter the countries by name
-     * @param string    $lang       Code of the language the label of the countries must be translated to
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array                List of countries
-     *
-     * @url     GET dictionary/countries
-     *
-     * @throws RestException
-     */
-    public function getListOfCountries($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $lang = '', $sqlfilters = '')
-    {
-        $list = array();
-
-        // Note: The filter is not applied in the SQL request because it must
-        // be applied to the translated names, not to the names in database.
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
-        $sql .= " WHERE 1 = 1";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $obj = $this->db->fetch_object($result);
-                $country = new Ccountry($this->db);
-                if ($country->fetch($obj->rowid) > 0) {
-                    // Translate the name of the country if needed
-                    // and then apply the filter if there is one.
-                    $this->translateLabel($country, $lang, 'Country');
-
-                    if (empty($filter) || stripos($country->label, $filter) !== false) {
-                        $list[] = $this->_cleanObjectDatas($country);
-                    }
-                }
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of countries');
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get country by ID.
-     *
-     * @param int       $id        ID of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/{id}
-     *
-     * @throws RestException
-     */
-    public function getCountryByID($id, $lang = '')
-    {
-        return $this->_fetchCcountry($id, '', '', $lang);
-    }
-
-    /**
-     * Get country by Code.
-     *
-     * @param string    $code      Code of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/byCode/{code}
-     *
-     * @throws RestException
-     */
-    public function getCountryByCode($code, $lang = '')
-    {
-        return $this->_fetchCcountry('', $code, '', $lang);
-    }
-
-    /**
-     * Get country by Iso.
-     *
-     * @param string    $iso       ISO of country
-     * @param string    $lang      Code of the language the name of the
-     *                             country must be translated to
-     * @return array 			   Array of cleaned object properties
-     *
-     * @url     GET dictionary/countries/byISO/{iso}
-     *
-     * @throws RestException
-     */
-    public function getCountryByISO($iso, $lang = '')
-    {
-        return $this->_fetchCcountry('', '', $iso, $lang);
-    }
-
-    /**
-    * Get state.
-    *
-    * @param int       $id        ID of state
-    * @param string    $code      Code of state
-    * @return array 			   Array of cleaned object properties
-    *
-    * @throws RestException
-    */
-    private function _fetchCstate($id, $code = '')
-    {
-        $state = new Cstate($this->db);
-
-        $result = $state->fetch($id, $code);
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieving state : '.$state->error);
-        } elseif ($result == 0) {
-            throw new RestException(404, 'State not found');
-        }
-
-        return $this->_cleanObjectDatas($state);
-    }
-
-    /**
-    * Get country.
-    *
-    * @param int       $id        ID of country
-    * @param string    $code      Code of country
-    * @param string    $iso       ISO of country
-    * @param string    $lang      Code of the language the name of the
-    *                             country must be translated to
-    * @return array 			   Array of cleaned object properties
-    *
-    * @throws RestException
-    */
-    private function _fetchCcountry($id, $code = '', $iso = '', $lang = '')
-    {
-        $country = new Ccountry($this->db);
-
-        $result = $country->fetch($id, $code, $iso);
-        if ($result < 0) {
-            throw new RestException(503, 'Error when retrieving country : '.$country->error);
-        } elseif ($result == 0) {
-            throw new RestException(404, 'country not found');
-        }
-
-        $this->translateLabel($country, $lang, 'Country');
-
-        return $this->_cleanObjectDatas($country);
-    }
-
-    /**
-     * Get the list of delivery times.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Delivery times is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter with.
-     *
-     * @url     GET dictionary/availability
-     *
-     * @return array [List of availability]
-     *
-     * @throws RestException 400
-     */
-    public function getAvailability($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        if (!DolibarrApiAccess::$user->rights->commande->lire) {
-        	throw new RestException(401);
-        }
-
-        $sql = "SELECT rowid, code, label";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param object    $object    Object to clean
-     * @return array 				Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
-
-        unset($object->error);
-        unset($object->errors);
-
-        return $object;
-    }
-
-    /**
-     * Translate the name of the object to the given language.
-     *
-     * @param object   $object    Object with label to translate
-     * @param string   $lang      Code of the language the name of the object must be translated to
-     * @param string   $prefix 	  Prefix for translation key
-     *
-     * @return void
-     */
-    private function translateLabel($object, $lang, $prefix = 'Country')
-    {
-        if (!empty($lang)) {
-            // Load the translations if this is a new language.
-            if ($this->translations == null || $this->translations->getDefaultLang() !== $lang) {
-                global $conf;
-                $this->translations = new Translate('', $conf);
-                $this->translations->setDefaultLang($lang);
-                $this->translations->load('dict');
-            }
-            if ($object->code) {
-                $key = $prefix.$object->code;
-
-                $translation = $this->translations->trans($key);
-                if ($translation != $key) {
-                    $object->label = html_entity_decode($translation);
-                }
-            }
-        }
-    }
-
-    /**
-     * Get the list of shipment methods.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     *
-     * @return array List of shipment methods
-     *
-     * @url     GET dictionary/shipment_methods
-     *
-     * @throws RestException
-     */
-    public function getListOfShipmentMethods($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        $sql = "SELECT t.rowid, t.code, t.libelle, t.description, t.tracking";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-            $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of shipment methods : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of events types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $type       To filter on type of event
-     * @param string    $module     To filter on module events
-     * @param int       $active     Event's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of events types
-     *
-     * @url     GET dictionary/event_types
-     *
-     * @throws RestException
-     */
-    public function getListOfEventTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT id, code, type, libelle as label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
-        $sql .= " WHERE t.active = ".$active;
-        if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of events types : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-
-    /**
-     * Get the list of Expense Report types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $module     To filter on module
-     * @param int       $active     Event's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of expense report types
-     *
-     * @url     GET dictionary/expensereport_types
-     *
-     * @throws RestException
-     */
-    public function getListOfExpenseReportsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT id, code, label, accountancy_code, active, module, position";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
-    	$sql .= " WHERE t.active = ".$active;
-    	if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of expense report types : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-
-    /**
-     * Get the list of contacts types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $type       To filter on type of contact
-     * @param string    $module     To filter on module contacts
-     * @param int       $active     Contact's type is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array	  List of Contacts types
-     *
-     * @url     GET dictionary/contact_types
-     *
-     * @throws RestException
-     */
-    public function getListOfContactTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
-        $sql .= " WHERE t.active = ".$active;
-        if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of contacts types : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of civilities.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $module     To filter on module events
-     * @param int       $active     Civility is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array		List of civility types
-     *
-     * @url     GET dictionary/civilities
-     *
-     * @throws RestException
-     */
-    public function getListOfCivilities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid, code, label, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
-        $sql .= " WHERE t.active = ".$active;
-        if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of civility : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of currencies.
-     *
-     * @param int       $multicurrency  Multicurrency rates (0: no multicurrency, 1: last rate, 2: all rates) {@min 0} {@max 2}
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of currencies
-     *
-     * @url     GET dictionary/currencies
-     *
-     * @throws RestException
-     */
-    public function getListOfCurrencies($multicurrency = 0, $sortfield = "code_iso", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        $sql = "SELECT t.code_iso, t.label, t.unicode";
-        if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
-        if (!empty($multicurrency)) {
-            $sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
-            $sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
-        }
-        $sql .= " WHERE t.active = ".$active;
-        if (!empty($multicurrency)) {
-            $sql .= " AND m.entity IN (".getEntity('multicurrency').")";
-            if (!empty($multicurrency) && $multicurrency != 2) {
-                $sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
-            }
-        }
-
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of currency : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of extra fields.
-     *
-     * @param string	$sortfield	Sort field
-     * @param string	$sortorder	Sort order
-     * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
-     * @return array				List of extra fields
-     *
-     * @url     GET extrafields
-     *
-     * @throws RestException
-     */
-    public function getListOfExtrafields($sortfield = "t.pos", $sortorder = 'ASC', $type = '', $sqlfilters = '')
-    {
-        $list = array();
-
-        if (!DolibarrApiAccess::$user->admin) {
-        	throw new RestException(401, 'Only an admin user can get list of extrafields');
-        }
-
-        if ($type == 'thirdparty') $type = 'societe';
-        if ($type == 'contact') $type = 'socpeople';
-
-        $sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
-        $sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
-        $sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
-        if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-        	if (!DolibarrApi::_checkFilters($sqlfilters))
-        	{
-        		throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-        	}
-        	$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-        	$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-        	if ($this->db->num_rows($resql))
-        	{
-        		while ($tab = $this->db->fetch_object($resql))
-        		{
-        			// New usage
-        			$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
-        			$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
-        			$list[$tab->elementtype][$tab->name]['size'] = $tab->size;
-        			$list[$tab->elementtype][$tab->name]['elementtype'] = $tab->elementtype;
-        			$list[$tab->elementtype][$tab->name]['default'] = $tab->fielddefault;
-        			$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
-        			$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
-        			$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
-        			$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
-        			$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
-        			$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
-        			$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
-        			$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
-        		}
-        	}
-        } else {
-            throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
-        }
-
-        if (!count($list))
-        {
-        	throw new RestException(404, 'No extrafield found');
-        }
-
-        return $list;
-    }
-
-
-    /**
-     * Get the list of towns.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param string    $zipcode    To filter on zipcode
-     * @param string    $town       To filter on city name
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of towns
-     *
-     * @url     GET dictionary/towns
-     *
-     * @throws RestException
-     */
-    public function getListOfTowns($sortfield = "zip,town", $sortorder = 'ASC', $limit = 100, $page = 0, $zipcode = '', $town = '', $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
-        $sql .= " AND t.active = ".$active;
-        if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
-        if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of towns : '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of payments terms.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/payment_terms
-     *
-     * @return array List of payment terms
-     *
-     * @throws RestException 400
-     */
-    public function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        if (!DolibarrApiAccess::$user->rights->propal->lire && !DolibarrApiAccess::$user->rights->commande->lire && !DolibarrApiAccess::$user->rights->facture->lire) {
-        	throw new RestException(401);
-        }
-
-        $sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of shipping methods.
-     *
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number {@min 0}
-     * @param int       $active     Shipping methodsm is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
-     *
-     * @url     GET dictionary/shipping_methods
-     *
-     * @return array List of shipping methods
-     *
-     * @throws RestException 400
-     */
-    public function getShippingModes($limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-
-        $sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-                $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        //$sql.= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(400, $this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of measuring units.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Measuring unit is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of measuring unit
-     *
-     * @url     GET dictionary/units
-     *
-     * @throws RestException
-     */
-    public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        $list = array();
-        //TODO link with multicurrency module
-        $sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
-        $sql .= " WHERE t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of measuring units: '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get the list of social networks.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Social network is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of social networks
-     *
-     * @url     GET dictionary/socialnetworks
-     *
-     * @throws RestException
-     */
-    public function getListOfsocialNetworks($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-        global $conf;
-
-        if (empty($conf->socialnetworks->enabled)) {
-            throw new RestException(400, 'API not available: this dictionary is not enabled by setup');
-        }
+	private $translations = null;
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+	}
+
+	/**
+	 * Get the list of ordering methods.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'OrderByWWW')"
+	 *
+	 * @url     GET dictionary/ordering_methods
+	 *
+	 * @return array [List of ordering methods]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getOrderingMethods($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid, code, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_input_method as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of payments types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/payment_types
+	 *
+	 * @return array [List of payment types]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getPaymentTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->propal->lire && !DolibarrApiAccess::$user->rights->commande->lire && !DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT id, code, type, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_paiement as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_paiement').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of states/provinces.
+	 *
+	 * The names of the states will be translated to the given language if
+	 * the $lang parameter is provided. The value of $lang must be a language
+	 * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
+	 * The returned list is sorted by state ID.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $filter     To filter the countries by name
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array                List of countries
+	 *
+	 * @url     GET dictionary/states
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		// Note: The filter is not applied in the SQL request because it must
+		// be applied to the translated names, not to the names in database.
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
+		$sql .= " WHERE 1 = 1";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$state = new Cstate($this->db);
+				if ($state->fetch($obj->rowid) > 0) {
+					if (empty($filter) || stripos($state->label, $filter) !== false) {
+						$list[] = $this->_cleanObjectDatas($state);
+					}
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of states');
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get state by ID.
+	 *
+	 * @param int       $id        ID of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/states/{id}
+	 *
+	 * @throws RestException
+	 */
+	public function getStateByID($id)
+	{
+		return $this->_fetchCstate($id, '');
+	}
+
+	/**
+	 * Get state by Code.
+	 *
+	 * @param string    $code      Code of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/states/byCode/{code}
+	 *
+	 * @throws RestException
+	 */
+	public function getStateByCode($code)
+	{
+		return $this->_fetchCstate('', $code);
+	}
+
+	/**
+	 * Get the list of countries.
+	 *
+	 * The names of the countries will be translated to the given language if
+	 * the $lang parameter is provided. The value of $lang must be a language
+	 * code supported by Dolibarr, for example 'en_US' or 'fr_FR'.
+	 * The returned list is sorted by country ID.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $filter     To filter the countries by name
+	 * @param string    $lang       Code of the language the label of the countries must be translated to
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array                List of countries
+	 *
+	 * @url     GET dictionary/countries
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCountries($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $lang = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		// Note: The filter is not applied in the SQL request because it must
+		// be applied to the translated names, not to the names in database.
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_country as t";
+		$sql .= " WHERE 1 = 1";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$obj = $this->db->fetch_object($result);
+				$country = new Ccountry($this->db);
+				if ($country->fetch($obj->rowid) > 0) {
+					// Translate the name of the country if needed
+					// and then apply the filter if there is one.
+					$this->translateLabel($country, $lang, 'Country');
+
+					if (empty($filter) || stripos($country->label, $filter) !== false) {
+						$list[] = $this->_cleanObjectDatas($country);
+					}
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of countries');
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get country by ID.
+	 *
+	 * @param int       $id        ID of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/{id}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByID($id, $lang = '')
+	{
+		return $this->_fetchCcountry($id, '', '', $lang);
+	}
+
+	/**
+	 * Get country by Code.
+	 *
+	 * @param string    $code      Code of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/byCode/{code}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByCode($code, $lang = '')
+	{
+		return $this->_fetchCcountry('', $code, '', $lang);
+	}
+
+	/**
+	 * Get country by Iso.
+	 *
+	 * @param string    $iso       ISO of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @url     GET dictionary/countries/byISO/{iso}
+	 *
+	 * @throws RestException
+	 */
+	public function getCountryByISO($iso, $lang = '')
+	{
+		return $this->_fetchCcountry('', '', $iso, $lang);
+	}
+
+	/**
+	 * Get state.
+	 *
+	 * @param int       $id        ID of state
+	 * @param string    $code      Code of state
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @throws RestException
+	 */
+	private function _fetchCstate($id, $code = '')
+	{
+		$state = new Cstate($this->db);
+
+		$result = $state->fetch($id, $code);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieving state : '.$state->error);
+		} elseif ($result == 0) {
+			throw new RestException(404, 'State not found');
+		}
+
+		return $this->_cleanObjectDatas($state);
+	}
+
+	/**
+	 * Get country.
+	 *
+	 * @param int       $id        ID of country
+	 * @param string    $code      Code of country
+	 * @param string    $iso       ISO of country
+	 * @param string    $lang      Code of the language the name of the
+	 *                             country must be translated to
+	 * @return array 			   Array of cleaned object properties
+	 *
+	 * @throws RestException
+	 */
+	private function _fetchCcountry($id, $code = '', $iso = '', $lang = '')
+	{
+		$country = new Ccountry($this->db);
+
+		$result = $country->fetch($id, $code, $iso);
+		if ($result < 0) {
+			throw new RestException(503, 'Error when retrieving country : '.$country->error);
+		} elseif ($result == 0) {
+			throw new RestException(404, 'country not found');
+		}
+
+		$this->translateLabel($country, $lang, 'Country');
+
+		return $this->_cleanObjectDatas($country);
+	}
+
+	/**
+	 * Get the list of delivery times.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Delivery times is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter with.
+	 *
+	 * @url     GET dictionary/availability
+	 *
+	 * @return array [List of availability]
+	 *
+	 * @throws RestException 400
+	 */
+	public function getAvailability($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->commande->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid, code, label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_availability as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param object    $object    Object to clean
+	 * @return array 				Array of cleaned object properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->error);
+		unset($object->errors);
+
+		return $object;
+	}
+
+	/**
+	 * Translate the name of the object to the given language.
+	 *
+	 * @param object   $object    Object with label to translate
+	 * @param string   $lang      Code of the language the name of the object must be translated to
+	 * @param string   $prefix 	  Prefix for translation key
+	 *
+	 * @return void
+	 */
+	private function translateLabel($object, $lang, $prefix = 'Country')
+	{
+		if (!empty($lang)) {
+			// Load the translations if this is a new language.
+			if ($this->translations == null || $this->translations->getDefaultLang() !== $lang) {
+				global $conf;
+				$this->translations = new Translate('', $conf);
+				$this->translations->setDefaultLang($lang);
+				$this->translations->load('dict');
+			}
+			if ($object->code) {
+				$key = $prefix.$object->code;
+
+				$translation = $this->translations->trans($key);
+				if ($translation != $key) {
+					$object->label = html_entity_decode($translation);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the list of shipment methods.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 *
+	 * @return array List of shipment methods
+	 *
+	 * @url     GET dictionary/shipment_methods
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfShipmentMethods($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		$sql = "SELECT t.rowid, t.code, t.libelle, t.description, t.tracking";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of shipment methods : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of events types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $type       To filter on type of event
+	 * @param string    $module     To filter on module events
+	 * @param int       $active     Event's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of events types
+	 *
+	 * @url     GET dictionary/event_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfEventTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT id, code, type, libelle as label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_actioncomm as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of events types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of Expense Report types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $module     To filter on module
+	 * @param int       $active     Event's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of expense report types
+	 *
+	 * @url     GET dictionary/expensereport_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfExpenseReportsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT id, code, label, accountancy_code, active, module, position";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of expense report types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of contacts types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $type       To filter on type of contact
+	 * @param string    $module     To filter on module contacts
+	 * @param int       $active     Contact's type is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array	  List of Contacts types
+	 *
+	 * @url     GET dictionary/contact_types
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfContactTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $type = '', $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, element as type, libelle as label, source, module, position";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_type_contact as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($type) $sql .= " AND type LIKE '%".$this->db->escape($type)."%'";
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of contacts types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of civilities.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $module     To filter on module events
+	 * @param int       $active     Civility is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array		List of civility types
+	 *
+	 * @url     GET dictionary/civilities
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCivilities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $module = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, label, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_civility as t";
+		$sql .= " WHERE t.active = ".$active;
+		if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of civility : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of currencies.
+	 *
+	 * @param int       $multicurrency  Multicurrency rates (0: no multicurrency, 1: last rate, 2: all rates) {@min 0} {@max 2}
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of currencies
+	 *
+	 * @url     GET dictionary/currencies
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfCurrencies($multicurrency = 0, $sortfield = "code_iso", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		$sql = "SELECT t.code_iso, t.label, t.unicode";
+		if (!empty($multicurrency)) $sql .= " , cr.date_sync, cr.rate ";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_currencies as t";
+		if (!empty($multicurrency)) {
+			$sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency as m ON m.code=t.code_iso";
+			$sql .= " JOIN ".MAIN_DB_PREFIX."multicurrency_rate as cr ON (m.rowid = cr.fk_multicurrency)";
+		}
+		$sql .= " WHERE t.active = ".$active;
+		if (!empty($multicurrency)) {
+			$sql .= " AND m.entity IN (".getEntity('multicurrency').")";
+			if (!empty($multicurrency) && $multicurrency != 2) {
+				$sql .= " AND cr.date_sync = (SELECT MAX(cr2.date_sync) FROM ".MAIN_DB_PREFIX."multicurrency_rate AS cr2 WHERE cr2.fk_multicurrency = m.rowid)";
+			}
+		}
+
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of currency : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of extra fields.
+	 *
+	 * @param string	$sortfield	Sort field
+	 * @param string	$sortorder	Sort order
+	 * @param string    $type       Type of element ('adherent', 'commande', 'thirdparty', 'facture', 'propal', 'product', ...)
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.label:like:'SO-%')"
+	 * @return array				List of extra fields
+	 *
+	 * @url     GET extrafields
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfExtrafields($sortfield = "t.pos", $sortorder = 'ASC', $type = '', $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->admin) {
+			throw new RestException(401, 'Only an admin user can get list of extrafields');
+		}
+
+		if ($type == 'thirdparty') $type = 'societe';
+		if ($type == 'contact') $type = 'socpeople';
+
+		$sql = "SELECT t.rowid, t.name, t.label, t.type, t.size, t.elementtype, t.fieldunique, t.fieldrequired, t.param, t.pos, t.alwayseditable, t.perms, t.list, t.fielddefault, t.fieldcomputed";
+		$sql .= " FROM ".MAIN_DB_PREFIX."extrafields as t";
+		$sql .= " WHERE t.entity IN (".getEntity('extrafields').")";
+		if (!empty($type)) $sql .= " AND t.elementtype = '".$this->db->escape($type)."'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				while ($tab = $this->db->fetch_object($resql))
+				{
+					// New usage
+					$list[$tab->elementtype][$tab->name]['type'] = $tab->type;
+					$list[$tab->elementtype][$tab->name]['label'] = $tab->label;
+					$list[$tab->elementtype][$tab->name]['size'] = $tab->size;
+					$list[$tab->elementtype][$tab->name]['elementtype'] = $tab->elementtype;
+					$list[$tab->elementtype][$tab->name]['default'] = $tab->fielddefault;
+					$list[$tab->elementtype][$tab->name]['computed'] = $tab->fieldcomputed;
+					$list[$tab->elementtype][$tab->name]['unique'] = $tab->fieldunique;
+					$list[$tab->elementtype][$tab->name]['required'] = $tab->fieldrequired;
+					$list[$tab->elementtype][$tab->name]['param'] = ($tab->param ? unserialize($tab->param) : '');
+					$list[$tab->elementtype][$tab->name]['pos'] = $tab->pos;
+					$list[$tab->elementtype][$tab->name]['alwayseditable'] = $tab->alwayseditable;
+					$list[$tab->elementtype][$tab->name]['perms'] = $tab->perms;
+					$list[$tab->elementtype][$tab->name]['list'] = $tab->list;
+				}
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of extra fields : '.$this->db->lasterror());
+		}
+
+		if (!count($list))
+		{
+			throw new RestException(404, 'No extrafield found');
+		}
+
+		return $list;
+	}
+
+
+	/**
+	 * Get the list of towns.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param string    $zipcode    To filter on zipcode
+	 * @param string    $town       To filter on city name
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of towns
+	 *
+	 * @url     GET dictionary/towns
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfTowns($sortfield = "zip,town", $sortorder = 'ASC', $limit = 100, $page = 0, $zipcode = '', $town = '', $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
+		$sql .= " AND t.active = ".$active;
+		if ($zipcode) $sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
+		if ($town)    $sql .= " AND t.town LIKE '%".$this->db->escape($town)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of towns : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of payments terms.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/payment_terms
+	 *
+	 * @return array List of payment terms
+	 *
+	 * @throws RestException 400
+	 */
+	public function getPaymentTerms($sortfield = "sortorder", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		if (!DolibarrApiAccess::$user->rights->propal->lire && !DolibarrApiAccess::$user->rights->commande->lire && !DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+
+		$sql = "SELECT rowid as id, code, sortorder, libelle as label, libelle_facture as descr, type_cdr, nbjour, decalage, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_payment_term').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of shipping methods.
+	 *
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number {@min 0}
+	 * @param int       $active     Shipping methodsm is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters SQL criteria to filter. Syntax example "(t.code:=:'CHQ')"
+	 *
+	 * @url     GET dictionary/shipping_methods
+	 *
+	 * @return array List of shipping methods
+	 *
+	 * @throws RestException 400
+	 */
+	public function getShippingModes($limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid as id, code, libelle as label, description, tracking, module";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_shipment_mode').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(400, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		//$sql.= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(400, $this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of measuring units.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Measuring unit is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of measuring unit
+	 *
+	 * @url     GET dictionary/units
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfMeasuringUnits($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+		//TODO link with multicurrency module
+		$sql = "SELECT t.rowid, t.code, t.label,t.short_label, t.active, t.scale, t.unit_type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_units as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of measuring units: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of social networks.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Social network is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of social networks
+	 *
+	 * @url     GET dictionary/socialnetworks
+	 *
+	 * @throws RestException
+	 */
+	public function getListOfsocialNetworks($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		global $conf;
+
+		if (empty($conf->socialnetworks->enabled)) {
+			throw new RestException(400, 'API not available: this dictionary is not enabled by setup');
+		}
 
 		$list = array();
-        //TODO link with multicurrency module
-        $sql = "SELECT t.rowid, t.entity, t.code, t.label, t.url, t.icon, t.active";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_socialnetworks as t";
-        $sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
-        $sql .= " AND t.active = ".$active;
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (!DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-
-        $sql .= $this->db->order($sortfield, $sortorder);
-
-        if ($limit) {
-            if ($page < 0) {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql .= $this->db->plimit($limit, $offset);
-        }
-
-        $result = $this->db->query($sql);
-
-        if ($result) {
-            $num = $this->db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            for ($i = 0; $i < $min; $i++) {
-                $list[] = $this->db->fetch_object($result);
-            }
-        } else {
-            throw new RestException(503, 'Error when retrieving list of social networks: '.$this->db->lasterror());
-        }
-
-        return $list;
-    }
-
-     /**
-     * Get the list of tickets categories.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket categories
-     *
-     * @url     GET dictionary/ticket_categories
-     *
-     * @throws RestException
-     */
-    public function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
-        $sql .= " WHERE t.active = ".$active;
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket categories : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get the list of tickets severity.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket severities
-     *
-     * @url     GET dictionary/ticket_severities
-     *
-     * @throws RestException
-     */
-    public function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
-        $sql .= " WHERE t.active = ".$active;
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket severities : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get the list of tickets types.
-     *
-     * @param string    $sortfield  Sort field
-     * @param string    $sortorder  Sort order
-     * @param int       $limit      Number of items per page
-     * @param int       $page       Page number (starting from zero)
-     * @param int       $active     Payment term is active or not {@min 0} {@max 1}
-     * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-     * @return array				List of ticket types
-     *
-     * @url     GET dictionary/ticket_types
-     *
-     * @throws RestException
-     */
-    public function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
-    {
-    	$list = array();
-
-    	$sql = "SELECT rowid, code, pos,  label, use_default, description";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
-        $sql .= " WHERE t.active = ".(int) $active;
-    	// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
-    	// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
-    	// Add sql filters
-    	if ($sqlfilters)
-    	{
-    		if (!DolibarrApi::_checkFilters($sqlfilters))
-    		{
-    			throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-    		}
-    		$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-    		$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-    	}
-
-
-    	$sql .= $this->db->order($sortfield, $sortorder);
-
-    	if ($limit) {
-    		if ($page < 0) {
-    			$page = 0;
-    		}
-    		$offset = $limit * $page;
-
-    		$sql .= $this->db->plimit($limit, $offset);
-    	}
-
-    	$result = $this->db->query($sql);
-
-    	if ($result) {
-    		$num = $this->db->num_rows($result);
-    		$min = min($num, ($limit <= 0 ? $num : $limit));
-    		for ($i = 0; $i < $min; $i++) {
-    			$list[] = $this->db->fetch_object($result);
-    		}
-    	} else {
-    		throw new RestException(503, 'Error when retrieving list of ticket types : '.$this->db->lasterror());
-    	}
-
-    	return $list;
-    }
-
-    /**
-     * Get properties of company
-     *
-     * @url	GET /company
-     *
-     * @return  array|mixed Data without useless information
-     *
-     */
-    public function getCompany()
-    {
-        global $mysoc;
-
-        return $this->_cleanObjectDatas($mysoc);
-    }
-
-
-    /**
-     * Get value of a setup variables
-     *
-     * Note that conf variables that stores security key or password hashes can't be loaded with API.
-     *
-     * @param	string			$constantname	Name of conf variable to get
-     * @return  array|mixed 				Data without useless information
-     *
-     * @url     GET conf/{constantname}
-     *
-     * @throws RestException 403 Forbidden
-     * @throws RestException 404 Error Bad or unknown value for constantname
-     */
-    public function getConf($constantname)
-    {
-    	global $conf;
-
-    	if (!DolibarrApiAccess::$user->admin
-    		&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ)) {
-    		throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_CONST_READ');
-    	}
-
-    	if (!preg_match('/^[a-zA-Z0-9_]+$/', $constantname) || !isset($conf->global->$constantname)) {
-    		throw new RestException(404, 'Error Bad or unknown value for constantname');
-    	}
-    	if (isASecretKey($constantname)) {
-    		throw new RestException(403, 'Forbidden. This parameter cant be read with APIs');
-    	}
-
-    	return $conf->global->$constantname;
-    }
-
-    /**
-     * Do a test of integrity for files and setup.
-     *
-     * @param string	$target			Can be 'local' or 'default' or Url of the signatures file to use for the test. Must be reachable by the tested Dolibarr.
-     * @return array					Result of file and setup integrity check
-     *
-     * @url     GET checkintegrity
-     *
-     * @throws RestException 404 Signature file not found
-     * @throws RestException 500 Technical error
-     * @throws RestException 503 Forbidden
-     */
-    public function getCheckIntegrity($target)
-    {
-    	global $langs, $conf;
-
-    	if (!DolibarrApiAccess::$user->admin
-    		&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
-    	{
-    		throw new RestException(503, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
-    	}
-
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-    	require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-
-    	$langs->load("admin");
-
-    	$outexpectedchecksum = '';
-    	$outcurrentchecksum = '';
-
-    	// Modified or missing files
-    	$file_list = array('missing' => array(), 'updated' => array());
-
-    	// Local file to compare to
-    	$xmlshortfile = GETPOST('xmlshortfile') ?GETPOST('xmlshortfile') : '/install/filelist-'.DOL_VERSION.'.xml';
-    	$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
-    	// Remote file to compare to
-    	$xmlremote = ($target == 'default' ? '' : $target);
-    	if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
-    	$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
-    	if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
-    	if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
-
-    	if ($target == 'local')
-    	{
-    		if (dol_is_file($xmlfile))
-    		{
-    			$xml = simplexml_load_file($xmlfile);
-    		} else {
-    			throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
-    		}
-    	} else {
-    		$xmlarray = getURLContent($xmlremote);
-
-    		// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
-    		if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
-    		{
-    			$xmlfile = $xmlarray['content'];
-    			//print "xmlfilestart".$xmlfile."endxmlfile";
-    			$xml = simplexml_load_string($xmlfile);
-    		} else {
-    			$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
-    			throw new RestException(500, $errormsg);
-    		}
-    	}
-
-
-
-    	if ($xml)
-    	{
-    		$checksumconcat = array();
-    		$file_list = array();
-    		$out = '';
-
-    		// Forced constants
-    		if (is_object($xml->dolibarr_constants[0]))
-    		{
-    			$out .= load_fiche_titre($langs->trans("ForcedConstants"));
-
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Constant").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("Value").'</td>';
-    			$out .= '</tr>'."\n";
-
-    			$i = 0;
-    			foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
-    			{
-    				$constname = $constant['name'];
-    				$constvalue = (string) $constant;
-    				$constvalue = (empty($constvalue) ? '0' : $constvalue);
-    				// Value found
-    				$value = '';
-    				if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
-    				$valueforchecksum = (empty($value) ? '0' : $value);
-
-    				$checksumconcat[] = $valueforchecksum;
-
-    				$i++;
-    				$out .= '<tr class="oddeven">';
-    				$out .= '<td>'.$i.'</td>'."\n";
-    				$out .= '<td>'.$constname.'</td>'."\n";
-    				$out .= '<td class="center">'.$constvalue.'</td>'."\n";
-    				$out .= '<td class="center">'.$valueforchecksum.'</td>'."\n";
-    				$out .= "</tr>\n";
-    			}
-
-    			if ($i == 0)
-    			{
-    				$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-    		}
-
-    		// Scan htdocs
-    		if (is_object($xml->dolibarr_htdocs_dir[0]))
-    		{
-    			//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
-    			$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
-
-    			// Defined qualified files (must be same than into generate_filelist_xml.php)
-    			$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
-    			$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
-    			$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
-
-    			// Fill file_list with files in signature, new files, modified files
-    			$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
-    			// Complete with list of new files
-    			foreach ($scanfiles as $keyfile => $valfile)
-    			{
-    				$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
-    				if (!in_array($tmprelativefilename, $file_list['insignature']))
-    				{
-    					$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
-    					$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
-    				}
-    			}
-
-    			// Files missings
-    			$out .= load_fiche_titre($langs->trans("FilesMissing"));
-
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
-    			if (is_array($tmpfilelist) && count($tmpfilelist))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    			} else {
-    				$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-
-    			// Files modified
-    			$out .= load_fiche_titre($langs->trans("FilesModified"));
-
-    			$totalsize = 0;
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("Size").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
-    			if (is_array($tmpfilelist2) && count($tmpfilelist2))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist2 as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
-    					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-    					$totalsize += $size;
-    					$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-    					$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    				$out .= '<tr class="liste_total">';
-    				$out .= '<td></td>'."\n";
-    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-    				$out .= '<td class="right"></td>'."\n";
-    				$out .= "</tr>\n";
-    			} else {
-    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-    			$out .= '<br>';
-
-    			// Files added
-    			$out .= load_fiche_titre($langs->trans("FilesAdded"));
-
-    			$totalsize = 0;
-    			$out .= '<div class="div-table-responsive-no-min">';
-    			$out .= '<table class="noborder">';
-    			$out .= '<tr class="liste_titre">';
-    			$out .= '<td>#</td>';
-    			$out .= '<td>'.$langs->trans("Filename").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
-    			$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("Size").'</td>';
-    			$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
-    			$out .= '</tr>'."\n";
-    			$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
-    			if (is_array($tmpfilelist3) && count($tmpfilelist3))
-    			{
-    				$i = 0;
-    				foreach ($tmpfilelist3 as $file)
-    				{
-    					$i++;
-    					$out .= '<tr class="oddeven">';
-    					$out .= '<td>'.$i.'</td>'."\n";
-    					$out .= '<td>'.$file['filename'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
-    					$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
-    					$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
-    					$totalsize += $size;
-    					$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
-    					$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
-    					$out .= "</tr>\n";
-    				}
-    				$out .= '<tr class="liste_total">';
-    				$out .= '<td></td>'."\n";
-    				$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td align="center"></td>'."\n";
-    				$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
-    				$out .= '<td class="right"></td>'."\n";
-    				$out .= "</tr>\n";
-    			} else {
-    				$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-    			}
-    			$out .= '</table>';
-    			$out .= '</div>';
-
-
-    			// Show warning
-    			if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
-    			{
-    				//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
-    			} else {
-    				//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
-    			}
-    		} else {
-    			throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
-    		}
-
-
-    		// Scan scripts
-
-
-    		asort($checksumconcat); // Sort list of checksum
-    		//var_dump($checksumconcat);
-    		$checksumget = md5(join(',', $checksumconcat));
-    		$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
-
-    		$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
-    		if ($checksumget == $checksumtoget)
-    		{
-    			if (count($file_list['added']))
-    			{
-    				$resultcode = 'warning';
-    				$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
-    				//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
-    				$outcurrentchecksum = $checksumget;
-    			} else {
-    				$resultcode = 'ok';
-    				$resultcomment = 'Success';
-    				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    				$outcurrentchecksum = $checksumget;
-    			}
-    		} else {
-    			$resultcode = 'error';
-    			$resultcomment = 'Error';
-    			//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
-    			$outcurrentchecksum = $checksumget;
-    		}
-    	} else {
-    		throw new RestException(404, 'No signature file known');
-    	}
-
-    	return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
-    }
+		//TODO link with multicurrency module
+		$sql = "SELECT t.rowid, t.entity, t.code, t.label, t.url, t.icon, t.active";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_socialnetworks as t";
+		$sql .= " WHERE t.entity IN (".getEntity('c_socialnetworks').")";
+		$sql .= " AND t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of social networks: '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	 /**
+	  * Get the list of tickets categories.
+	  *
+	  * @param string    $sortfield  Sort field
+	  * @param string    $sortorder  Sort order
+	  * @param int       $limit      Number of items per page
+	  * @param int       $page       Page number (starting from zero)
+	  * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	  * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	  * @return array				List of ticket categories
+	  *
+	  * @url     GET dictionary/ticket_categories
+	  *
+	  * @throws RestException
+	  */
+	public function getTicketsCategories($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_category as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket categories : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of tickets severity.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of ticket severities
+	 *
+	 * @url     GET dictionary/ticket_severities
+	 *
+	 * @throws RestException
+	 */
+	public function getTicketsSeverities($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, color, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_severity as t";
+		$sql .= " WHERE t.active = ".$active;
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket severities : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get the list of tickets types.
+	 *
+	 * @param string    $sortfield  Sort field
+	 * @param string    $sortorder  Sort order
+	 * @param int       $limit      Number of items per page
+	 * @param int       $page       Page number (starting from zero)
+	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
+	 * @return array				List of ticket types
+	 *
+	 * @url     GET dictionary/ticket_types
+	 *
+	 * @throws RestException
+	 */
+	public function getTicketsTypes($sortfield = "code", $sortorder = 'ASC', $limit = 100, $page = 0, $active = 1, $sqlfilters = '')
+	{
+		$list = array();
+
+		$sql = "SELECT rowid, code, pos,  label, use_default, description";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ticket_type as t";
+		$sql .= " WHERE t.active = ".(int) $active;
+		// if ($type) $sql .= " AND t.type LIKE '%".$this->db->escape($type)."%'";
+		// if ($module)    $sql .= " AND t.module LIKE '%".$this->db->escape($module)."%'";
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (!DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			for ($i = 0; $i < $min; $i++) {
+				$list[] = $this->db->fetch_object($result);
+			}
+		} else {
+			throw new RestException(503, 'Error when retrieving list of ticket types : '.$this->db->lasterror());
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Get properties of company
+	 *
+	 * @url	GET /company
+	 *
+	 * @return  array|mixed Data without useless information
+	 *
+	 */
+	public function getCompany()
+	{
+		global $mysoc;
+
+		return $this->_cleanObjectDatas($mysoc);
+	}
+
+
+	/**
+	 * Get value of a setup variables
+	 *
+	 * Note that conf variables that stores security key or password hashes can't be loaded with API.
+	 *
+	 * @param	string			$constantname	Name of conf variable to get
+	 * @return  array|mixed 				Data without useless information
+	 *
+	 * @url     GET conf/{constantname}
+	 *
+	 * @throws RestException 403 Forbidden
+	 * @throws RestException 404 Error Bad or unknown value for constantname
+	 */
+	public function getConf($constantname)
+	{
+		global $conf;
+
+		if (!DolibarrApiAccess::$user->admin
+			&& (empty($conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ) || DolibarrApiAccess::$user->login != $conf->global->API_LOGINS_ALLOWED_FOR_CONST_READ)) {
+			throw new RestException(403, 'Error API open to admin users only or to the users with logins defined into constant API_LOGINS_ALLOWED_FOR_CONST_READ');
+		}
+
+		if (!preg_match('/^[a-zA-Z0-9_]+$/', $constantname) || !isset($conf->global->$constantname)) {
+			throw new RestException(404, 'Error Bad or unknown value for constantname');
+		}
+		if (isASecretKey($constantname)) {
+			throw new RestException(403, 'Forbidden. This parameter cant be read with APIs');
+		}
+
+		return $conf->global->$constantname;
+	}
+
+	/**
+	 * Do a test of integrity for files and setup.
+	 *
+	 * @param string	$target			Can be 'local' or 'default' or Url of the signatures file to use for the test. Must be reachable by the tested Dolibarr.
+	 * @return array					Result of file and setup integrity check
+	 *
+	 * @url     GET checkintegrity
+	 *
+	 * @throws RestException 404 Signature file not found
+	 * @throws RestException 500 Technical error
+	 * @throws RestException 503 Forbidden
+	 */
+	public function getCheckIntegrity($target)
+	{
+		global $langs, $conf;
+
+		if (!DolibarrApiAccess::$user->admin
+			&& (empty($conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK) || DolibarrApiAccess::$user->login != $conf->global->API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK))
+		{
+			throw new RestException(503, 'Error API open to admin users only or to the users with logins defined into constant API_LOGIN_ALLOWED_FOR_INTEGRITY_CHECK');
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+		$langs->load("admin");
+
+		$outexpectedchecksum = '';
+		$outcurrentchecksum = '';
+
+		// Modified or missing files
+		$file_list = array('missing' => array(), 'updated' => array());
+
+		// Local file to compare to
+		$xmlshortfile = GETPOST('xmlshortfile') ?GETPOST('xmlshortfile') : '/install/filelist-'.DOL_VERSION.'.xml';
+		$xmlfile = DOL_DOCUMENT_ROOT.$xmlshortfile;
+		// Remote file to compare to
+		$xmlremote = ($target == 'default' ? '' : $target);
+		if (empty($xmlremote) && !empty($conf->global->MAIN_FILECHECK_URL)) $xmlremote = $conf->global->MAIN_FILECHECK_URL;
+		$param = 'MAIN_FILECHECK_URL_'.DOL_VERSION;
+		if (empty($xmlremote) && !empty($conf->global->$param)) $xmlremote = $conf->global->$param;
+		if (empty($xmlremote)) $xmlremote = 'https://www.dolibarr.org/files/stable/signatures/filelist-'.DOL_VERSION.'.xml';
+
+		if ($target == 'local')
+		{
+			if (dol_is_file($xmlfile))
+			{
+				$xml = simplexml_load_file($xmlfile);
+			} else {
+				throw new RestException(500, $langs->trans('XmlNotFound').': '.$xmlfile);
+			}
+		} else {
+			$xmlarray = getURLContent($xmlremote);
+
+			// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
+			if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '404')
+			{
+				$xmlfile = $xmlarray['content'];
+				//print "xmlfilestart".$xmlfile."endxmlfile";
+				$xml = simplexml_load_string($xmlfile);
+			} else {
+				$errormsg = $langs->trans('XmlNotFound').': '.$xmlremote.' - '.$xmlarray['http_code'].' '.$xmlarray['curl_error_no'].' '.$xmlarray['curl_error_msg'];
+				throw new RestException(500, $errormsg);
+			}
+		}
+
+
+
+		if ($xml)
+		{
+			$checksumconcat = array();
+			$file_list = array();
+			$out = '';
+
+			// Forced constants
+			if (is_object($xml->dolibarr_constants[0]))
+			{
+				$out .= load_fiche_titre($langs->trans("ForcedConstants"));
+
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Constant").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedValue").'</td>';
+				$out .= '<td class="center">'.$langs->trans("Value").'</td>';
+				$out .= '</tr>'."\n";
+
+				$i = 0;
+				foreach ($xml->dolibarr_constants[0]->constant as $constant)    // $constant is a simpleXMLElement
+				{
+					$constname = $constant['name'];
+					$constvalue = (string) $constant;
+					$constvalue = (empty($constvalue) ? '0' : $constvalue);
+					// Value found
+					$value = '';
+					if ($constname && $conf->global->$constname != '') $value = $conf->global->$constname;
+					$valueforchecksum = (empty($value) ? '0' : $value);
+
+					$checksumconcat[] = $valueforchecksum;
+
+					$i++;
+					$out .= '<tr class="oddeven">';
+					$out .= '<td>'.$i.'</td>'."\n";
+					$out .= '<td>'.$constname.'</td>'."\n";
+					$out .= '<td class="center">'.$constvalue.'</td>'."\n";
+					$out .= '<td class="center">'.$valueforchecksum.'</td>'."\n";
+					$out .= "</tr>\n";
+				}
+
+				if ($i == 0)
+				{
+					$out .= '<tr class="oddeven"><td colspan="4" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+			}
+
+			// Scan htdocs
+			if (is_object($xml->dolibarr_htdocs_dir[0]))
+			{
+				//var_dump($xml->dolibarr_htdocs_dir[0]['includecustom']);exit;
+				$includecustom = (empty($xml->dolibarr_htdocs_dir[0]['includecustom']) ? 0 : $xml->dolibarr_htdocs_dir[0]['includecustom']);
+
+				// Defined qualified files (must be same than into generate_filelist_xml.php)
+				$regextoinclude = '\.(php|php3|php4|php5|phtml|phps|phar|inc|css|scss|html|xml|js|json|tpl|jpg|jpeg|png|gif|ico|sql|lang|txt|yml|bak|md|mp3|mp4|wav|mkv|z|gz|zip|rar|tar|less|svg|eot|woff|woff2|ttf|manifest)$';
+				$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
+				$scanfiles = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude);
+
+				// Fill file_list with files in signature, new files, modified files
+				$ret = getFilesUpdated($file_list, $xml->dolibarr_htdocs_dir[0], '', DOL_DOCUMENT_ROOT, $checksumconcat); // Fill array $file_list
+				// Complete with list of new files
+				foreach ($scanfiles as $keyfile => $valfile)
+				{
+					$tmprelativefilename = preg_replace('/^'.preg_quote(DOL_DOCUMENT_ROOT, '/').'/', '', $valfile['fullname']);
+					if (!in_array($tmprelativefilename, $file_list['insignature']))
+					{
+						$md5newfile = @md5_file($valfile['fullname']); // Can fails if we don't have permission to open/read file
+						$file_list['added'][] = array('filename'=>$tmprelativefilename, 'md5'=>$md5newfile);
+					}
+				}
+
+				// Files missings
+				$out .= load_fiche_titre($langs->trans("FilesMissing"));
+
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist = dol_sort_array($file_list['missing'], 'filename');
+				if (is_array($tmpfilelist) && count($tmpfilelist))
+				{
+					$i = 0;
+					foreach ($tmpfilelist as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+
+				// Files modified
+				$out .= load_fiche_titre($langs->trans("FilesModified"));
+
+				$totalsize = 0;
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+				$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+				$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist2 = dol_sort_array($file_list['updated'], 'filename');
+				if (is_array($tmpfilelist2) && count($tmpfilelist2))
+				{
+					$i = 0;
+					foreach ($tmpfilelist2 as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
+						$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+						$totalsize += $size;
+						$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+						$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+					$out .= '<tr class="liste_total">';
+					$out .= '<td></td>'."\n";
+					$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+					$out .= '<td class="right"></td>'."\n";
+					$out .= "</tr>\n";
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+				$out .= '<br>';
+
+				// Files added
+				$out .= load_fiche_titre($langs->trans("FilesAdded"));
+
+				$totalsize = 0;
+				$out .= '<div class="div-table-responsive-no-min">';
+				$out .= '<table class="noborder">';
+				$out .= '<tr class="liste_titre">';
+				$out .= '<td>#</td>';
+				$out .= '<td>'.$langs->trans("Filename").'</td>';
+				$out .= '<td class="center">'.$langs->trans("ExpectedChecksum").'</td>';
+				$out .= '<td class="center">'.$langs->trans("CurrentChecksum").'</td>';
+				$out .= '<td class="right">'.$langs->trans("Size").'</td>';
+				$out .= '<td class="right">'.$langs->trans("DateModification").'</td>';
+				$out .= '</tr>'."\n";
+				$tmpfilelist3 = dol_sort_array($file_list['added'], 'filename');
+				if (is_array($tmpfilelist3) && count($tmpfilelist3))
+				{
+					$i = 0;
+					foreach ($tmpfilelist3 as $file)
+					{
+						$i++;
+						$out .= '<tr class="oddeven">';
+						$out .= '<td>'.$i.'</td>'."\n";
+						$out .= '<td>'.$file['filename'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['expectedmd5'].'</td>'."\n";
+						$out .= '<td class="center">'.$file['md5'].'</td>'."\n";
+						$size = dol_filesize(DOL_DOCUMENT_ROOT.'/'.$file['filename']);
+						$totalsize += $size;
+						$out .= '<td class="right">'.dol_print_size($size).'</td>'."\n";
+						$out .= '<td class="right">'.dol_print_date(dol_filemtime(DOL_DOCUMENT_ROOT.'/'.$file['filename']), 'dayhour').'</td>'."\n";
+						$out .= "</tr>\n";
+					}
+					$out .= '<tr class="liste_total">';
+					$out .= '<td></td>'."\n";
+					$out .= '<td>'.$langs->trans("Total").'</td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td align="center"></td>'."\n";
+					$out .= '<td class="right">'.dol_print_size($totalsize).'</td>'."\n";
+					$out .= '<td class="right"></td>'."\n";
+					$out .= "</tr>\n";
+				} else {
+					$out .= '<tr class="oddeven"><td colspan="5" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				}
+				$out .= '</table>';
+				$out .= '</div>';
+
+
+				// Show warning
+				if (empty($tmpfilelist) && empty($tmpfilelist2) && empty($tmpfilelist3))
+				{
+					//setEventMessages($langs->trans("FileIntegrityIsStrictlyConformedWithReference"), null, 'mesgs');
+				} else {
+					//setEventMessages($langs->trans("FileIntegritySomeFilesWereRemovedOrModified"), null, 'warnings');
+				}
+			} else {
+				throw new RestException(500, 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile);
+			}
+
+
+			// Scan scripts
+
+
+			asort($checksumconcat); // Sort list of checksum
+			//var_dump($checksumconcat);
+			$checksumget = md5(join(',', $checksumconcat));
+			$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
+
+			$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
+			if ($checksumget == $checksumtoget)
+			{
+				if (count($file_list['added']))
+				{
+					$resultcode = 'warning';
+					$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
+					//$outcurrentchecksum =  $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans("FileIntegrityIsOkButFilesWereAdded").'</span>';
+					$outcurrentchecksum = $checksumget;
+				} else {
+					$resultcode = 'ok';
+					$resultcomment = 'Success';
+					//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+					$outcurrentchecksum = $checksumget;
+				}
+			} else {
+				$resultcode = 'error';
+				$resultcomment = 'Error';
+				//$outcurrentchecksum = '<span class="'.$resultcode.'">'.$checksumget.'</span>';
+				$outcurrentchecksum = $checksumget;
+			}
+		} else {
+			throw new RestException(404, 'No signature file known');
+		}
+
+		return array('resultcode'=>$resultcode, 'resultcomment'=>$resultcomment, 'expectedchecksum'=> $outexpectedchecksum, 'currentchecksum'=> $outcurrentchecksum, 'out'=>$out);
+	}
 }
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index d9bfea71510..ef3ea4ce975 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -386,7 +386,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 121517b2544..7687ab250ac 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -85,7 +85,7 @@ $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
@@ -311,6 +311,7 @@ foreach ($search as $key => $val)
 	}
 	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 }
+
 if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -485,7 +486,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/bom/tpl/objectline_create.tpl.php b/htdocs/bom/tpl/objectline_create.tpl.php
index 2a675cc60e1..a7bb62c9901 100644
--- a/htdocs/bom/tpl/objectline_create.tpl.php
+++ b/htdocs/bom/tpl/objectline_create.tpl.php
@@ -113,7 +113,7 @@ if ($conf->global->PRODUCT_USE_UNITS)
 {
 	$coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
+	// print $form->selectUnits(empty($line->fk_unit) ? $conf->global->PRODUCT_USE_UNITS : $line->fk_unit, "units");
 	print '</td>';
 }
 
diff --git a/htdocs/bom/tpl/objectline_edit.tpl.php b/htdocs/bom/tpl/objectline_edit.tpl.php
index 3840f495dea..6954e657db9 100644
--- a/htdocs/bom/tpl/objectline_edit.tpl.php
+++ b/htdocs/bom/tpl/objectline_edit.tpl.php
@@ -112,7 +112,7 @@ if ($conf->global->PRODUCT_USE_UNITS)
 {
     $coldisplay++;
 	print '<td class="nobottom linecoluseunit left">';
-	print $form->selectUnits($line->fk_unit, "units");
+	// print $form->selectUnits($line->fk_unit, "units");
 	print '</td>';
 }
 
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index c5ee3870272..ecaf9117aae 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -82,7 +82,7 @@ print '</td>';
 if ($conf->global->PRODUCT_USE_UNITS)
 {
 	print '<td class="linecoluseunit nowrap left">';
-	$label = $line->getLabelOfUnit('short');
+	$label = $tmpproduct->getLabelOfUnit('long');
 	if ($label !== '') {
 		print $langs->trans($label);
 	}
@@ -111,21 +111,21 @@ print '</td>';
 if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 	print '<td class="linecoledit center">';
 	$coldisplay++;
-    if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
-    } else {
-        print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'">'.img_edit().'</a>';
-    }
-    print '</td>';
+	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
+	} else {
+		print '<a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'">'.img_edit().'</a>';
+	}
+	print '</td>';
 
-    print '<td class="linecoldelete center">';
-    $coldisplay++;
-    if (($line->fk_prev_id == null) && empty($disableremove)) {
-        //La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
-        print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$line->id.'">';
-        print img_delete();
-        print '</a>';
-    }
-    print '</td>';
+	print '<td class="linecoldelete center">';
+	$coldisplay++;
+	if (($line->fk_prev_id == null) && empty($disableremove)) {
+		//La suppression n'est autorisée que si il n'y a pas de ligne dans une précédente situation
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=deleteline&amp;token='.newToken().'&amp;lineid='.$line->id.'">';
+		print img_delete();
+		print '</a>';
+	}
+	print '</td>';
 
 	if ($num > 1 && $conf->browser->layout != 'phone' && empty($disablemove)) {
 		print '<td class="linecolmove tdlineupdown center">';
@@ -146,14 +146,14 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 		$coldisplay++;
 	}
 } else {
-    print '<td colspan="3"></td>';
-    $coldisplay = $coldisplay + 3;
+	print '<td colspan="3"></td>';
+	$coldisplay = $coldisplay + 3;
 }
 
 if ($action == 'selectlines') {
-    print '<td class="linecolcheck center">';
-    print '<input type="checkbox" class="linecheckbox" name="line_checkbox['.($i + 1).']" value="'.$line->id.'" >';
-    print '</td>';
+	print '<td class="linecolcheck center">';
+	print '<input type="checkbox" class="linecheckbox" name="line_checkbox['.($i + 1).']" value="'.$line->id.'" >';
+	print '</td>';
 }
 
 print '</tr>';
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index e1dc53ed6e8..d9d12c5d84e 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -141,7 +141,7 @@ for ($i = 0; $i < $nbtoshow; $i++)
 </fieldset>
 
 <!-- ========================= Cadre "Amount" ============================= -->
-<form id="frmDifference"  class="formulaire1" method="post" onsubmit="javascript: return verifReglement()" action="validation_verif.php?action=valide_achat">
+<form id="frmDifference"  class="formulaire1" method="post" onsubmit="javascript: return verifReglement()" action="validation_verif.php?action=validate_sell">
 	<input type="hidden" name="hdnChoix" value="" />
 	<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Amount"); ?></legend>
diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php
index 0434473d359..cc558cca058 100644
--- a/htdocs/cashdesk/tpl/validation1.tpl.php
+++ b/htdocs/cashdesk/tpl/validation1.tpl.php
@@ -97,7 +97,7 @@ if ($obj_facturation->amountReturned()) {
 
 	</table>
 
-	<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
+	<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=validate_invoice">
 		<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 		<p class="note_label">
 			<?php
diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php
index 6b8e9af94f1..d57aaa251ce 100644
--- a/htdocs/cashdesk/validation_verif.php
+++ b/htdocs/cashdesk/validation_verif.php
@@ -42,7 +42,7 @@ switch ($action)
 	    $redirection = DOL_URL_ROOT.'/cashdesk/affIndex.php?menutpl=validation';
 		break;
 
-	case 'valide_achat':
+	case 'validate_sell':
 	    $thirdpartyid = $_SESSION['CASHDESK_ID_THIRDPARTY'];
 
 		$company = new Societe($db);
@@ -112,7 +112,7 @@ switch ($action)
 		break;
 
 
-	case 'valide_facture':
+	case 'validate_invoice':
 		$now = dol_now();
 
 		// Recuperation de la date et de l'heure
@@ -344,7 +344,7 @@ switch ($action)
 		}
 		break;
 
-		// End of case: valide_facture
+		// End of case: validate_invoice
 }
 
 unset($_SESSION['serObjFacturation']);
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 53a343046b7..7c8c683bf18 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -33,16 +33,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->load("categories");
 
 $id = GETPOST('id', 'int');
-$ref = GETPOST('ref');
-$type = GETPOST('type');
+$ref = GETPOST('ref', 'alphanohtml');
+$type = GETPOST('type', 'alphanohtml');
 $action = (GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'edit');
 $confirm = GETPOST('confirm');
 $cancel = GETPOST('cancel', 'alpha');
 
 $socid = GETPOST('socid', 'int');
-$label = GETPOST('label');
-$description = GETPOST('description');
-$color = GETPOST('color', 'alpha');
+$label = GETPOST('label', 'alphanohtml');
+$description = GETPOST('description', 'restricthtml');
+$color = preg_replace('/[^0-9a-f#]/i', '', GETPOST('color', 'alphanohtml'));
 $visible = GETPOST('visible');
 $parent = GETPOST('parent');
 
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index dc0a980a6f8..866a98fd816 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -44,8 +44,8 @@ $confirm = GETPOST('confirm');
 
 if ($id == '' && $label == '')
 {
-    dol_print_error('', 'Missing parameter id');
-    exit();
+	dol_print_error('', 'Missing parameter id');
+	exit();
 }
 
 // Security check
@@ -70,34 +70,34 @@ if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backwar
 
 if (isset($_FILES['userfile']) && $_FILES['userfile']['size'] > 0 && $_POST["sendit"] && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
-    if ($object->id) {
-        $file = $_FILES['userfile'];
-        if (is_array($file['name']) && count($file['name']) > 0)
-        {
-            foreach ($file['name'] as $i => $name)
-            {
-                if (empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i]))
-                {
-                    setEventMessage($file['name'][$i].' : '.$langs->trans(empty($file['tmp_name'][$i]) ? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles'));
-                    unset($file['name'][$i], $file['type'][$i], $file['tmp_name'][$i], $file['error'][$i], $file['size'][$i]);
-                }
-            }
-        }
+	if ($object->id) {
+		$file = $_FILES['userfile'];
+		if (is_array($file['name']) && count($file['name']) > 0)
+		{
+			foreach ($file['name'] as $i => $name)
+			{
+				if (empty($file['tmp_name'][$i]) || intval($conf->global->MAIN_UPLOAD_DOC) * 1000 <= filesize($file['tmp_name'][$i]))
+				{
+					setEventMessage($file['name'][$i].' : '.$langs->trans(empty($file['tmp_name'][$i]) ? 'ErrorFailedToSaveFile' : 'MaxSizeForUploadedFiles'));
+					unset($file['name'][$i], $file['type'][$i], $file['tmp_name'][$i], $file['error'][$i], $file['size'][$i]);
+				}
+			}
+		}
 
-        if (!empty($file['tmp_name'])) {
-            $object->add_photo($upload_dir, $file);
-        }
-    }
+		if (!empty($file['tmp_name'])) {
+			$object->add_photo($upload_dir, $file);
+		}
+	}
 }
 
 if ($action == 'confirm_delete' && $_GET["file"] && $confirm == 'yes' && $user->rights->categorie->creer)
 {
-    $object->delete_photo($upload_dir."/".$_GET["file"]);
+	$object->delete_photo($upload_dir."/".$_GET["file"]);
 }
 
 if ($action == 'addthumb' && $_GET["file"])
 {
-    $object->addThumbs($upload_dir."/".$_GET["file"]);
+	$object->addThumbs($upload_dir."/".$_GET["file"]);
 }
 
 
@@ -126,7 +126,7 @@ if ($object->id)
 	$ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 	foreach ($ways as $way)
 	{
-	    $morehtmlref .= $way."<br>\n";
+		$morehtmlref .= $way."<br>\n";
 	}
 	$morehtmlref .= '</div>';
 
@@ -137,7 +137,7 @@ if ($object->id)
 	*/
 	if ($action == 'delete')
 	{
-	    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&type='.$type.'&file='.$_GET["file"], $langs->trans('DeletePicture'), $langs->trans('ConfirmDeletePicture'), 'confirm_delete', '', 0, 1);
 	}
 
 	print '<br>';
@@ -159,7 +159,7 @@ if ($object->id)
 	print '</td></tr>';
 
 	print "</table>\n";
-    print '</div>';
+	print '</div>';
 
 	dol_fiche_end();
 
@@ -213,62 +213,62 @@ if ($object->id)
 
 		if (is_array($listofphoto) && count($listofphoto))
 		{
-    		print '<br>';
-            print '<table width="100%" valign="top" align="center">';
+			print '<br>';
+			print '<table width="100%" valign="top" align="center">';
 
-    		foreach ($listofphoto as $key => $obj)
-    		{
-    			$nbphoto++;
+			foreach ($listofphoto as $key => $obj)
+			{
+				$nbphoto++;
 
-    			if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
-    			if ($nbbyrow) print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 1)) print '<tr align=center valign=middle border=1>';
+				if ($nbbyrow) print '<td width="'.ceil(100 / $nbbyrow).'%" class="photo">';
 
-    			print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
+				print '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$obj['photo']).'" alt="Taille origine" target="_blank">';
 
-    			// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
-    			if ($obj['photo_vignette'])
-    			{
-    				$filename = $obj['photo_vignette'];
-    			} else {
-    				$filename = $obj['photo'];
-    			}
+				// Si fichier vignette disponible, on l'utilise, sinon on utilise photo origine
+				if ($obj['photo_vignette'])
+				{
+					$filename = $obj['photo_vignette'];
+				} else {
+					$filename = $obj['photo'];
+				}
 
-    			// Nom affiche
-    			$viewfilename = $obj['photo'];
+				// Nom affiche
+				$viewfilename = $obj['photo'];
 
-    			// Taille de l'image
-    			$object->get_image_size($dir.$filename);
-    			$imgWidth = ($object->imgWidth < $maxWidth) ? $object->imgWidth : $maxWidth;
-    			$imgHeight = ($object->imgHeight < $maxHeight) ? $object->imgHeight : $maxHeight;
+				// Taille de l'image
+				$object->get_image_size($dir.$filename);
+				$imgWidth = ($object->imgWidth < $maxWidth) ? $object->imgWidth : $maxWidth;
+				$imgHeight = ($object->imgHeight < $maxHeight) ? $object->imgHeight : $maxHeight;
 
-    			print '<img border="0" width="'.$imgWidth.'" height="'.$imgHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename).'">';
+				print '<img border="0" width="'.$imgWidth.'" height="'.$imgHeight.'" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=category&entity='.$object->entity.'&file='.urlencode($pdir.$filename).'">';
 
-    			print '</a>';
-    			print '<br>'.$viewfilename;
-    			print '<br>';
+				print '</a>';
+				print '<br>'.$viewfilename;
+				print '<br>';
 
-    			// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
-    			if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight))
-    			{
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addthumb&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
-    			}
-    			if ($user->rights->categorie->creer)
-    			{
-    				print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
-    				print img_delete().'</a>';
-    			}
-    			if ($nbbyrow) print '</td>';
-    			if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) print '</tr>';
-    		}
+				// On propose la generation de la vignette si elle n'existe pas et si la taille est superieure aux limites
+				if (!$obj['photo_vignette'] && preg_match('/(\.bmp|\.gif|\.jpg|\.jpeg|\.png)$/i', $obj['photo']) && ($object->imgWidth > $maxWidth || $object->imgHeight > $maxHeight))
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=addthumb&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">'.img_picto($langs->trans('GenerateThumb'), 'refresh').'&nbsp;&nbsp;</a>';
+				}
+				if ($user->rights->categorie->creer)
+				{
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;type='.$type.'&amp;file='.urlencode($pdir.$viewfilename).'">';
+					print img_delete().'</a>';
+				}
+				if ($nbbyrow) print '</td>';
+				if ($nbbyrow && ($nbphoto % $nbbyrow == 0)) print '</tr>';
+			}
 
-    		// Ferme tableau
-    		while ($nbphoto % $nbbyrow)
-    		{
-    			print '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
-    			$nbphoto++;
-    		}
+			// Ferme tableau
+			while ($nbphoto % $nbbyrow)
+			{
+				print '<td width="'.ceil(100 / $nbbyrow).'%">&nbsp;</td>';
+				$nbphoto++;
+			}
 
-    		print '</table>';
+			print '</table>';
 		}
 
 		if ($nbphoto < 1)
@@ -277,7 +277,7 @@ if ($object->id)
 		}
 	}
 } else {
-    print $langs->trans("ErrorUnknown");
+	print $langs->trans("ErrorUnknown");
 }
 
 // End of page
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index f5755a697ca..f4e073c4e1c 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -83,43 +83,43 @@ $cancel != $langs->trans("Cancel") &&
 	$current_lang = $langs->getDefaultLang();
 
 	// check parameters
-    $forcelangprod = GETPOST('forcelangprod', 'alpha');
-    $libelle = GETPOST('libelle', 'alpha');
-    $desc = GETPOST('desc', 'restricthtml');
+	$forcelangprod = GETPOST('forcelangprod', 'alpha');
+	$libelle = GETPOST('libelle', 'alpha');
+	$desc = GETPOST('desc', 'restricthtml');
 
-    if (empty($forcelangprod)) {
-        $error++;
-        $object->errors[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Translation'));
-    }
+	if (empty($forcelangprod)) {
+		$error++;
+		$object->errors[] = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Translation'));
+	}
 
-    if (!$error) {
-        if (empty($libelle)) {
-            $error++;
-            $object->errors[] = $langs->trans('Language_'.$forcelangprod).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
-        }
+	if (!$error) {
+		if (empty($libelle)) {
+			$error++;
+			$object->errors[] = $langs->trans('Language_'.$forcelangprod).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
+		}
 
-        if (!$error) {
-            // update de l'objet
-            if ($forcelangprod == $current_lang) {
-                $object->label = $libelle;
-                $object->description = dol_htmlcleanlastbr($desc);
-            } else {
-                $object->multilangs[$forcelangprod]["label"] = $libelle;
-                $object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr($desc);
-            }
+		if (!$error) {
+			// update de l'objet
+			if ($forcelangprod == $current_lang) {
+				$object->label = $libelle;
+				$object->description = dol_htmlcleanlastbr($desc);
+			} else {
+				$object->multilangs[$forcelangprod]["label"] = $libelle;
+				$object->multilangs[$forcelangprod]["description"] = dol_htmlcleanlastbr($desc);
+			}
 
-            // sauvegarde en base
-            $res = $object->setMultiLangs($user);
-            if ($res < 0) $error++;
-        }
-    }
+			// sauvegarde en base
+			$res = $object->setMultiLangs($user);
+			if ($res < 0) $error++;
+		}
+	}
 
-    if ($error) {
-        $action = 'add';
-        setEventMessages($object->error, $object->errors, 'errors');
-    } else {
-        $action = '';
-    }
+	if ($error) {
+		$action = 'add';
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		$action = '';
+	}
 }
 
 // Validation de l'edition
@@ -132,13 +132,13 @@ $cancel != $langs->trans("Cancel") &&
 
 	foreach ($object->multilangs as $key => $value) // enregistrement des nouvelles valeurs dans l'objet
 	{
-        $libelle = GETPOST('libelle-'.$key, 'alpha');
-        $desc = GETPOST('desc-'.$key);
+		$libelle = GETPOST('libelle-'.$key, 'alpha');
+		$desc = GETPOST('desc-'.$key);
 
-        if (empty($libelle)) {
-            $error++;
-            $object->errors[] = $langs->trans('Language_'.$key).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
-        }
+		if (empty($libelle)) {
+			$error++;
+			$object->errors[] = $langs->trans('Language_'.$key).' : '.$langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Label'));
+		}
 
 		if ($key == $current_lang) {
 			$object->label       = $libelle;
@@ -149,17 +149,17 @@ $cancel != $langs->trans("Cancel") &&
 		}
 	}
 
-    if (!$error) {
-        $res = $object->setMultiLangs($user);
-        if ($res < 0)   $error++;
-    }
+	if (!$error) {
+		$res = $object->setMultiLangs($user);
+		if ($res < 0)   $error++;
+	}
 
-    if ($error) {
-        $action = 'edit';
-        setEventMessages($object->error, $object->errors, 'errors');
-    } else {
-        $action = '';
-    }
+	if ($error) {
+		$action = 'edit';
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		$action = '';
+	}
 }
 
 
@@ -181,10 +181,10 @@ $head = categories_prepare_head($object, $type);
 $cnt_trans = 0;
 if (!empty($object->multilangs))
 {
-    foreach ($object->multilangs as $key => $value)
-    {
-        $cnt_trans++;
-    }
+	foreach ($object->multilangs as $key => $value)
+	{
+		$cnt_trans++;
+	}
 }
 
 dol_fiche_head($head, 'translation', $langs->trans($title), -1, 'category');
@@ -195,7 +195,7 @@ $object->ref = $object->label;
 $morehtmlref = '<br><div class="refidno"><a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
 $ways = $object->print_all_ways(" &gt;&gt; ", '', 1);
 foreach ($ways as $way) {
-    $morehtmlref .= $way."<br>\n";
+	$morehtmlref .= $way."<br>\n";
 }
 $morehtmlref .= '</div>';
 
@@ -238,11 +238,11 @@ print "\n<div class=\"tabsAction\">\n";
 
 if ($action == '')
 {
-    if ($user->rights->produit->creer || $user->rights->service->creer)
-    {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
-        if ($cnt_trans > 0) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
-    }
+	if ($user->rights->produit->creer || $user->rights->service->creer)
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=add&id='.$object->id.'&type='.$type.'">'.$langs->trans('Add').'</a>';
+		if ($cnt_trans > 0) print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&id='.$object->id.'&type='.$type.'">'.$langs->trans('Update').'</a>';
+	}
 }
 
 print "\n</div>\n";
@@ -258,20 +258,20 @@ if ($action == 'edit')
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="vedit">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	if (!empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
-		    print "<br><b><u>".$langs->trans('Language_'.$key)." :</u></b><br>";
+			print "<br><b><u>".$langs->trans('Language_'.$key)." :</u></b><br>";
 			print '<table class="border centpercent">';
 
 			// Label
-            $libelle = (GETPOST('libelle-'.$key, 'alpha') ? GETPOST('libelle-'.$key, 'alpha') : $object->multilangs[$key]['label']);
+			$libelle = (GETPOST('libelle-'.$key, 'alpha') ? GETPOST('libelle-'.$key, 'alpha') : $object->multilangs[$key]['label']);
 			print '<tr><td class="titlefield fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.$libelle.'"></td></tr>';
 			// Desc
-            $desc = (GETPOST('desc-'.$key) ? GETPOST('desc-'.$key) : $object->multilangs[$key]['description']);
+			$desc = (GETPOST('desc-'.$key) ? GETPOST('desc-'.$key) : $object->multilangs[$key]['description']);
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
 			$doleditor = new DolEditor("desc-$key", $desc, '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
 			$doleditor->Create();
@@ -293,20 +293,20 @@ if ($action == 'edit')
 	print '</form>';
 } elseif ($action != 'add')
 {
-    if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
+	if ($cnt_trans) print '<div class="underbanner clearboth"></div>';
 
-    if (!empty($object->multilangs))
+	if (!empty($object->multilangs))
 	{
 		foreach ($object->multilangs as $key => $value)
 		{
-		    $s = picto_from_langcode($key);
+			$s = picto_from_langcode($key);
 			print '<table class="border centpercent">';
 			print '<tr class="liste_titre"><td colspan="2">'.($s ? $s.' ' : '')." <b>".$langs->trans('Language_'.$key).":</b> ".'<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'&langtodelete='.$key.'&type='.$type.'">'.img_delete('', '').'</a></td></tr>';
 			print '<tr><td class="titlefield">'.$langs->trans('Label').'</td><td>'.$object->multilangs[$key]["label"].'</td></tr>';
 			print '<tr><td>'.$langs->trans('Description').'</td><td>'.$object->multilangs[$key]["description"].'</td></tr>';
 			if (!empty($conf->global->CATEGORY_USE_OTHER_FIELD_IN_TRANSLATION))
 			{
-                print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
+				print '<tr><td>'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>'.$object->multilangs[$key]["other"].'</td></tr>';
 			}
 			print '</table>';
 		}
@@ -329,11 +329,11 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="vadd">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
-    print '<input type="hidden" name="type" value="'.$type.'">';
+	print '<input type="hidden" name="type" value="'.$type.'">';
 
 	print '<table class="border centpercent">';
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans('Translation').'</td><td>';
-    print $formadmin->select_language(GETPOST('forcelangprod', 'alpha'), 'forcelangprod', 0, $object->multilangs);
+	print $formadmin->select_language(GETPOST('forcelangprod', 'alpha'), 'forcelangprod', 0, $object->multilangs);
 	print '</td></tr>';
 	print '<tr><td class="fieldrequired">'.$langs->trans('Label').'</td>';
 	print '<td><input name="libelle" class="minwidth200 maxwidth300" value="'.GETPOST('libelle', 'alpha').'"></td></tr>';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 3c8ed94c2bf..5b50958591f 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -71,8 +71,6 @@ $offsetunit = GETPOST('offsetunittype_duration', 'aZ09');
 $remindertype = GETPOST('selectremindertype', 'aZ09');
 $modelmail = GETPOST('actioncommsendmodel_mail', 'int');
 
-//var_dump($_POST); exit;
-
 $datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
 $datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
 
@@ -111,8 +109,6 @@ if ($id > 0 && $action != 'add') {
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-//var_dump($_POST);
-
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('actioncard', 'globalcard'));
 
@@ -144,7 +140,7 @@ if (empty($reshook) && (GETPOST('removedassigned') || GETPOST('removedassigned')
 	{
 		if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]);
 	}
-	//var_dump($_POST['removedassigned']);exit;
+
 	$_SESSION['assignedtouser'] = json_encode($tmpassigneduserids);
 	$donotclearsession = 1;
 	if ($action == 'add') $action = 'create';
@@ -393,7 +389,7 @@ if (empty($reshook) && $action == 'add')
 				$moreparam = '';
 				if ($user->id != $object->userownerid) $moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view.
 
-                //Create reminders
+				// Create reminders
                 if ($addreminder == 'on'){
                     $actionCommReminder = new ActionCommReminder($db);
 
@@ -1068,49 +1064,48 @@ if ($action == 'create')
     // Location
     if (empty($conf->global->AGENDA_DISABLE_LOCATION))
     {
-		print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="minwidth300" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
+		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
     }
 
 	// Assigned to
 	print '<tr><td class="tdtop nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
 	$listofuserid = array();
+	$listofcontactid = array();
+	$listofotherid = array();
+
 	if (empty($donotclearsession))
 	{
 		$assignedtouser = GETPOST("assignedtouser") ?GETPOST("assignedtouser") : (!empty($object->userownerid) && $object->userownerid > 0 ? $object->userownerid : $user->id);
 		if ($assignedtouser) $listofuserid[$assignedtouser] = array('id'=>$assignedtouser, 'mandatory'=>0, 'transparency'=>$object->transparency); // Owner first
-		$listofuserid[$user->id]['transparency'] = GETPOSTISSET('transparency') ?GETPOST('transparency', 'alpha') : 1; // 1 by default at first init
+		//$listofuserid[$user->id] = array('id'=>$user->id, 'mandatory'=>0, 'transparency'=>(GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1)); // 1 by default at first init
+		$listofuserid[$assignedtouser]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 1); // 1 by default at first init
 		$_SESSION['assignedtouser'] = json_encode($listofuserid);
 	} else {
 		if (!empty($_SESSION['assignedtouser']))
 		{
 			$listofuserid = json_decode($_SESSION['assignedtouser'], true);
 		}
-		$listofuserid[$user->id]['transparency'] = GETPOSTISSET('transparency') ?GETPOST('transparency', 'alpha') : 0; // 0 by default when refreshing
+		$firstelem = reset($listofuserid);
+		if (isset($listofuserid[$firstelem['id']])) $listofuserid[$firstelem['id']]['transparency'] = (GETPOSTISSET('transparency') ? GETPOST('transparency', 'alpha') : 0); // 0 by default when refreshing
 	}
 	print '<div class="assignedtouser">';
 	print $form->select_dolusers_forevent(($action == 'create' ? 'add' : 'update'), 'assignedtouser', 1, '', 0, '', '', 0, 0, 0, 'AND u.statut != 0', 1, $listofuserid, $listofcontactid, $listofotherid);
 	print '</div>';
-	/*if (in_array($user->id,array_keys($listofuserid)))
-	{
-		print '<div class="myavailability">';
-		print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked':'').'> '.$langs->trans("Busy");
-		print '</div>';
-	}*/
 	print '</td></tr>';
 
 	// Done by
 	if (!empty($conf->global->AGENDA_ENABLE_DONEBY))
 	{
 		print '<tr><td class="nowrap">'.$langs->trans("ActionDoneBy").'</td><td>';
-		print $form->select_dolusers(GETPOST("doneby") ?GETPOST("doneby") : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
+		print $form->select_dolusers(GETPOSTISSET("doneby") ? GETPOST("doneby", 'int') : (!empty($object->userdoneid) && $percent == 100 ? $object->userdoneid : 0), 'doneby', 1);
 		print '</td></tr>';
 	}
 
 	if ($conf->categorie->enabled) {
 		// Categories
-		print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
+		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
-		print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');
+		print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, 'minwidth300 quatrevingtpercent', 0, 0);
 		print "</td></tr>";
 	}
 
@@ -1126,8 +1121,7 @@ if ($action == 'create')
 	{
 		// Related company
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
-		if (GETPOST('socid', 'int') > 0)
-		{
+		if (GETPOST('socid', 'int') > 0) {
 			$societe = new Societe($db);
 			$societe->fetch(GETPOST('socid', 'int'));
 			print $societe->getNomUrl(1);
@@ -1148,7 +1142,8 @@ if ($action == 'create')
 		print '<tr><td class="nowrap">'.$langs->trans("ActionOnContact").'</td><td>';
 		$preselectedids = GETPOST('socpeopleassigned', 'array');
 		if (GETPOST('contactid', 'int')) $preselectedids[GETPOST('contactid', 'int')] = GETPOST('contactid', 'int');
-		print img_picto('', 'contact', 'class="paddingrightonly"').$form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
+		print img_picto('', 'contact', 'class="paddingrightonly"');
+		print $form->selectcontacts(GETPOST('socid', 'int'), $preselectedids, 'socpeopleassigned[]', 1, '', '', 0, 'minwidth300 quatrevingtpercent', false, 0, array(), false, 'multiple', 'contactid');
 		print '</td></tr>';
 	}
 
@@ -1161,7 +1156,7 @@ if ($action == 'create')
 
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td id="project-input-container" >';
 		print img_picto('', 'project', 'class="paddingrightonly"');
-		$numproject = $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+		print $formproject->select_projects((!empty($societe->id) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$societe->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 		$urloption = '?action=create&donotclearsession=1';
@@ -1171,10 +1166,11 @@ if ($action == 'create')
 		print "\n".'<script type="text/javascript">';
 		print '$(document).ready(function () {
 	               $("#projectid").change(function () {
-                        var url = "'.$url.'&projectid="+$("#projectid").val();
+                        var url = "'.DOL_URL_ROOT.'/projet/ajax/projects.php?mode=gettasks&socid="+$("#projectid").val()+"&projectid="+$("#projectid").val();
+						console.log("Call url to get new list of tasks: "+url);
                         $.get(url, function(data) {
-                            console.log($( data ).find("#taskid").html());
-                            if (data) $("#taskid").html( $( data ).find("#taskid").html() ).select2();
+                            console.log(data);
+                            if (data) $("#taskid").html(data).select2();
                         })
                   });
                })';
@@ -1186,7 +1182,7 @@ if ($action == 'create')
 		print img_picto('', 'projecttask', 'class="paddingrightonly"');
 		$projectsListId = false;
 		if (!empty($projectid)) { $projectsListId = $projectid; }
-		$tid = GETPOST("projecttaskid") ?GETPOST("projecttaskid") : '';
+		$tid = GETPOST("projecttaskid") ? GETPOST("projecttaskid") : '';
 		$formproject->selectTasks((!empty($societe->id) ? $societe->id : -1), $tid, 'taskid', 24, 0, '1', 1, 0, 0, 'maxwidth500', $projectsListId);
 		print '</td></tr>';
 	}
@@ -1197,10 +1193,10 @@ if ($action == 'create')
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("LinkedObject").'</td>';
 		print '<td colspan="3">'.dolGetElementUrl($originid, $origin, 1).'</td></tr>';
-		print '<input type="hidden" name="fk_element" size="10" value="'.GETPOST('originid').'">';
-		print '<input type="hidden" name="elementtype" size="10" value="'.GETPOST('origin').'">';
-		print '<input type="hidden" name="originid" size="10" value="'.GETPOST('originid').'">';
-		print '<input type="hidden" name="origin" size="10" value="'.GETPOST('origin').'">';
+		print '<input type="hidden" name="fk_element" value="'.GETPOST('originid', 'int').'">';
+		print '<input type="hidden" name="elementtype" value="'.GETPOST('origin').'">';
+		print '<input type="hidden" name="originid" value="'.GETPOST('originid', 'int').'">';
+		print '<input type="hidden" name="origin" value="'.GETPOST('origin').'">';
 	}
 
 	$reg = array();
@@ -1350,7 +1346,7 @@ if ($id > 0)
 		$object->contact_id   = GETPOST("contactid", 'int');
 		$object->fk_project  = GETPOST("projectid", 'int');
 
-		$object_private = GETPOST("note", 'restricthtml');
+		$object->note_private = GETPOST("note", 'restricthtml');
 	}
 
 	if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
@@ -1954,8 +1950,6 @@ if ($id > 0)
 		/*
 		if ($object->datep != $object->datef && in_array($user->id,array_keys($listofuserid)))
 		{
-			//var_dump($object->userassigned);
-			//var_dump($listofuserid);
 			print '<div class="myavailability">';
 			print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available"));	// We show nothing if event is assigned to nobody
 			print '</div>';
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index a48dc03aea2..7a52183b195 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -360,7 +360,9 @@ if (empty($action) || $action == 'show_month')
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%b %Y");
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
-	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a> ";
+	if (empty($conf->dol_optimize_smallscreen)) {
+		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth.$param."\">".$langs->trans("Today")."</a> ";
+	}
 	$picto = 'calendar';
 }
 if ($action == 'show_week')
@@ -369,7 +371,9 @@ if ($action == 'show_week')
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
-	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	if (empty($conf->dol_optimize_smallscreen)) {
+		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	}
 	$picto = 'calendarweek';
 }
 if ($action == 'show_day')
@@ -378,7 +382,9 @@ if ($action == 'show_day')
 	$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "daytextshort");
 	$nav .= " </span>\n";
 	$nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\"></i></a>\n";
-	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	if (empty($conf->dol_optimize_smallscreen)) {
+		$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+	}
 	$picto = 'calendarday';
 }
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index 72b25c9d731..f0c1a0d1951 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -274,34 +274,17 @@ $lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
 $max_day_in_month = date("t", dol_mktime(0, 0, 0, $month, 1, $year));
 
 $tmpday = $first_day;
-$picto = 'calendartype';
+$picto = 'calendarweek';
 
 $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev_day.$param."\">".img_previous($langs->trans("Previous"))."</a>\n";
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y")."</span> \n";
 $nav .= "<a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\">".img_next($langs->trans("Next"))."</a>\n";
-$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
-$picto = 'calendarweek';
+if (empty($conf->dol_optimize_smallscreen)) {
+	$nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a>)";
+}
 
-/*$nav .= ' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-$nav .= '<input type="hidden" name="token" value="'.newToken().'">';
-$nav .= '<input type="hidden" name="action" value="'.$action.'">';
-$nav .= '<input type="hidden" name="filtert" value="'.$filtert.'">';
-$nav .= '<input type="hidden" name="usergroup" value="'.$usergroup.'">';
-$nav .= '<input type="hidden" name="actioncode" value="'.$actioncode.'">';
-$nav .= '<input type="hidden" name="resourceid" value="'.$resourceid.'">';
-$nav .= '<input type="hidden" name="status" value="'.$status.'">';
-$nav .= '<input type="hidden" name="socid" value="'.$socid.'">';
-$nav .= '<input type="hidden" name="projectid" value="'.$projectid.'">';
-$nav .= '<input type="hidden" name="begin_h" value="'.$begin_h.'">';
-$nav .= '<input type="hidden" name="end_h" value="'.$end_h.'">';
-$nav .= '<input type="hidden" name="begin_d" value="'.$begin_d.'">';
-$nav .= '<input type="hidden" name="end_d" value="'.$end_d.'">';
-$nav .= '<input type="hidden" name="showbirthday" value="'.$showbirthday.'">';
-*/
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-//$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
-//$nav .= '</form>';
 
 // Must be after the nav definition
 $param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index f99cc3cbd16..899925b16f6 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -285,28 +285,11 @@ $nav = "<a href=\"?year=".$prev_year."&amp;month=".$prev_month."&amp;day=".$prev
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("Week")." ".$week;
 $nav .= " </span>\n";
 $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;day=".$next_day.$param."\"><i class=\"fa fa-chevron-right\" title=\"".dol_escape_htmltag($langs->trans("Next"))."\"></i></a>\n";
-$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
-
-/*$nav.=' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-$nav.='<input type="hidden" name="token" value="' . newToken() . '">';
-$nav.='<input type="hidden" name="action" value="' . $action . '">';
-$nav.='<input type="hidden" name="filtert" value="' . $filtert . '">';
-$nav.='<input type="hidden" name="usergroup" value="' . $usergroup . '">';
-$nav.='<input type="hidden" name="actioncode" value="' . $actioncode . '">';
-$nav.='<input type="hidden" name="resourceid" value="' . $resourceid . '">';
-$nav.='<input type="hidden" name="status" value="' . $status . '">';
-$nav.='<input type="hidden" name="socid" value="' . $socid . '">';
-$nav.='<input type="hidden" name="projectid" value="' . $projectid . '">';
-$nav.='<input type="hidden" name="begin_h" value="' . $begin_h . '">';
-$nav.='<input type="hidden" name="end_h" value="' . $end_h . '">';
-$nav.='<input type="hidden" name="begin_d" value="' . $begin_d . '">';
-$nav.='<input type="hidden" name="end_d" value="' . $end_d . '">';
-$nav.='<input type="hidden" name="showbirthday" value="' . $showbirthday . '">';
-*/
+if (empty($conf->dol_optimize_smallscreen)) {
+	$nav .= " &nbsp; <a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day=".$nowday.$param."\">".$langs->trans("Today")."</a> ";
+}
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
-//$nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
 $nav .= ' <button type="submit" class="liste_titre button_search" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
-//$nav.='</form>';
 
 // Must be after the nav definition
 $param .= '&year='.urlencode($year).'&month='.urlencode($month).($day ? '&day='.urlencode($day) : '');
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index d056f4fb3af..9de895f0094 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -138,12 +138,12 @@ if (empty($reshook))
 	}
 
 	// customer preferred shipping method
-    if ($action == 'setshippingmethod' && $user->rights->societe->creer)
-    {
-        $object->fetch($id);
-        $result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
-        if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
-    }
+	if ($action == 'setshippingmethod' && $user->rights->societe->creer)
+	{
+		$object->fetch($id);
+		$result = $object->setShippingMethod(GETPOST('shipping_method_id', 'int'));
+		if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
+	}
 
 	// assujetissement a la TVA
 	if ($action == 'setassujtva' && $user->rights->societe->creer)
@@ -191,31 +191,31 @@ if (empty($reshook))
 	}
 
 	// Set sales representatives
-    if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
+	if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
 	{
 		$object->fetch($id);
 		$result = $object->setSalesRep(GETPOST('commercial', 'array'));
 	}
 
 	if ($action == 'update_extras') {
-        $object->fetch($id);
+		$object->fetch($id);
 
-        $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-        // Fill array 'array_options' with data from update form
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-        if ($ret < 0) $error++;
-        if (!$error)
-        {
-        	$result = $object->insertExtraFields('COMPANY_MODIFY');
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
+		if (!$error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
-        }
-        if ($error) $action = 'edit_extras';
-    }
+		}
+		if ($error) $action = 'edit_extras';
+	}
 }
 
 
@@ -249,11 +249,11 @@ if ($object->id > 0)
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
 	// Prospect/Customer
@@ -262,16 +262,16 @@ if ($object->id > 0)
 	print '</td></tr>';
 
 	// Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
-	    print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
-	    print '</td></tr>';
-    }
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td>'.$langs->trans("Prefix").'</td><td>';
+		print ($object->prefix_comm ? $object->prefix_comm : '&nbsp;');
+		print '</td></tr>';
+	}
 
 	if ($object->client)
 	{
-        $langs->load("compta");
+		$langs->load("compta");
 
 		print '<tr><td>';
 		print $langs->trans('CustomerCode').'</td><td>';
@@ -386,64 +386,64 @@ if ($object->id > 0)
 	// Relative discounts (Discounts-Drawbacks-Rebates)
 	if ($isCustomer)
 	{
-    	print '<tr><td class="nowrap">';
-    	print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-    	print $langs->trans("CustomerRelativeDiscountShort");
-    	print '<td><td class="right">';
-    	if ($user->rights->societe->creer && !$user->socid > 0)
-    	{
-    		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
-    	}
-    	print '</td></tr></table>';
-    	print '</td><td>'.($object->remise_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>' : '').'</td>';
-    	print '</tr>';
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans("CustomerRelativeDiscountShort");
+		print '<td><td class="right">';
+		if ($user->rights->societe->creer && !$user->socid > 0)
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.img_edit($langs->trans("Modify")).'</a>';
+		}
+		print '</td></tr></table>';
+		print '</td><td>'.($object->remise_percent ? '<a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$object->id.'">'.$object->remise_percent.'%</a>' : '').'</td>';
+		print '</tr>';
 
-    	// Absolute discounts (Discounts-Drawbacks-Rebates)
-    	print '<tr><td class="nowrap">';
-    	print '<table width="100%" class="nobordernopadding">';
-    	print '<tr><td class="nowrap">';
-    	print $langs->trans("CustomerAbsoluteDiscountShort");
-    	print '<td><td class="right">';
-    	if ($user->rights->societe->creer && !$user->socid > 0)
-    	{
-    		print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
-    	}
-    	print '</td></tr></table>';
-    	print '</td>';
-    	print '<td>';
-    	$amount_discount = $object->getAvailableDiscounts();
-    	if ($amount_discount < 0) dol_print_error($db, $object->error);
-    	if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
-    	//else print $langs->trans("DiscountNone");
-    	print '</td>';
-    	print '</tr>';
+		// Absolute discounts (Discounts-Drawbacks-Rebates)
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding">';
+		print '<tr><td class="nowrap">';
+		print $langs->trans("CustomerAbsoluteDiscountShort");
+		print '<td><td class="right">';
+		if ($user->rights->societe->creer && !$user->socid > 0)
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.img_edit($langs->trans("Modify")).'</a>';
+		}
+		print '</td></tr></table>';
+		print '</td>';
+		print '<td>';
+		$amount_discount = $object->getAvailableDiscounts();
+		if ($amount_discount < 0) dol_print_error($db, $object->error);
+		if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount, 1, $langs, 1, -1, -1, $conf->currency).'</a>';
+		//else print $langs->trans("DiscountNone");
+		print '</td>';
+		print '</tr>';
 	}
 
 	// Max outstanding bill
 	if ($object->client)
 	{
-	    print '<tr class="nowrap">';
-	    print '<td>';
-	    print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer);
-	    print '</td><td>';
-	    $limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
-	    print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer, $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
-	    print '</td>';
-	    print '</tr>';
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer);
+		print '</td><td>';
+		$limit_field_type = (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE)) ? 'numeric' : 'amount';
+		print $form->editfieldval("OutstandingBill", 'outstanding_limit', $object->outstanding_limit, $object, $user->rights->societe->creer, $limit_field_type, ($object->outstanding_limit != '' ? price($object->outstanding_limit) : ''));
+		print '</td>';
+		print '</tr>';
 	}
 
 	if ($object->client)
 	{
 		if (!empty($conf->commande->enabled) && !empty($conf->global->ORDER_MANAGE_MIN_AMOUNT))
 		{
-		    print '<!-- Minimim amount for orders -->'."\n";
-		    print '<tr class="nowrap">';
-		    print '<td>';
-		    print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer);
-		    print '</td><td>';
-		    print $form->editfieldval("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer, $limit_field_type, ($object->order_min_amount != '' ? price($object->order_min_amount) : ''));
-		    print '</td>';
-		    print '</tr>';
+			print '<!-- Minimim amount for orders -->'."\n";
+			print '<tr class="nowrap">';
+			print '<td>';
+			print $form->editfieldkey("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer);
+			print '</td><td>';
+			print $form->editfieldval("OrderMinAmount", 'order_min_amount', $object->order_min_amount, $object, $user->rights->societe->creer, $limit_field_type, ($object->order_min_amount != '' ? price($object->order_min_amount) : ''));
+			print '</td>';
+			print '</tr>';
 		}
 	}
 
@@ -468,20 +468,41 @@ if ($object->id > 0)
 		print '</tr>';
 	}
 
-    // Preferred shipping Method
-    if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
+	// Preferred shipping Method
+	if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD)) {
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('SendingMethod');
+		print '<td>';
+		if (($action != 'editshipping') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editshipping')
+		{
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
+		} else {
+			$form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+	}
+
+    if (! empty($conf->intracommreport->enabled))
+    {
+        // Transport mode by default
         print '<tr><td class="nowrap">';
-        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-        print $langs->trans('SendingMethod');
+        print '<table class="centpercent nobordernopadding"><tr><td class="nowrap">';
+        print $langs->trans('IntracommReportTransportMode');
         print '<td>';
-        if (($action != 'editshipping') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editshipping&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+        if (($action != 'edittransportmode') && $user->rights->societe->creer) print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edittransportmode&amp;socid='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
         print '</tr></table>';
         print '</td><td>';
-        if ($action == 'editshipping')
+        if ($action == 'edittransportmode')
         {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'shipping_method_id', 1);
-        } else {
-            $form->formSelectShippingMethod($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->shipping_method_id, 'none');
+            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'fk_transport_mode', 1);
+        }
+        else {
+            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_transport_mode, 'none');
         }
         print "</td>";
         print '</tr>';
@@ -500,70 +521,70 @@ if ($object->id > 0)
 	$parameters = array('socid'=>$object->id);
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-    // Sales representative
+	// Sales representative
 	include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
-    // Module Adherent
-    if (!empty($conf->adherent->enabled))
-    {
-        $langs->load("members");
-        $langs->load("users");
+	// Module Adherent
+	if (!empty($conf->adherent->enabled))
+	{
+		$langs->load("members");
+		$langs->load("users");
 
-        print '<tr><td class="titlefield">'.$langs->trans("LinkedToDolibarrMember").'</td>';
-        print '<td>';
-        $adh = new Adherent($db);
-        $result = $adh->fetch('', '', $object->id);
-        if ($result > 0)
-        {
-            $adh->ref = $adh->getFullName($langs);
-            print $adh->getNomUrl(1);
-        } else {
-            print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
-        }
-        print '</td>';
-        print "</tr>\n";
-    }
+		print '<tr><td class="titlefield">'.$langs->trans("LinkedToDolibarrMember").'</td>';
+		print '<td>';
+		$adh = new Adherent($db);
+		$result = $adh->fetch('', '', $object->id);
+		if ($result > 0)
+		{
+			$adh->ref = $adh->getFullName($langs);
+			print $adh->getNomUrl(1);
+		} else {
+			print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
+		}
+		print '</td>';
+		print "</tr>\n";
+	}
 
 	print "</table>";
 
 	// Prospection level and status
 	if ($object->client == 2 || $object->client == 3)
 	{
-    	print '<br>';
+		print '<br>';
 
-    	print '<div class="underbanner clearboth"></div>';
-    	print '<table class="border centpercent tableforfield">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
 
-	    // Level of prospection
-	    print '<tr><td class="titlefield nowrap">';
-	    print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
-	    print $langs->trans('ProspectLevel');
-	    print '<td>';
-	    if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
-	    print '</tr></table>';
-	    print '</td><td>';
-	    if ($action == 'editlevel')
-	    {
-	        $formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
-	    } else {
-	        print $object->getLibProspLevel();
-	    }
-        print "</td>";
-        print '</tr>';
+		// Level of prospection
+		print '<tr><td class="titlefield nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('ProspectLevel');
+		print '<td>';
+		if ($action != 'editlevel' && $user->rights->societe->creer) print '<td class="right"><a class="editfielda reposition" href="'.$_SERVER["PHP_SELF"].'?action=editlevel&amp;socid='.$object->id.'">'.img_edit($langs->trans('Modify'), 1).'</a></td>';
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editlevel')
+		{
+			$formcompany->form_prospect_level($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->fk_prospectlevel, 'prospect_level_id', 1);
+		} else {
+			print $object->getLibProspLevel();
+		}
+		print "</td>";
+		print '</tr>';
 
-        // Status of prospection
-        $object->loadCacheOfProspStatus();
-        print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
-        print ' &nbsp; &nbsp; ';
-        print '<div class="floatright">';
-        foreach ($object->cacheprospectstatus as $key => $val)
-        {
+		// Status of prospection
+		$object->loadCacheOfProspStatus();
+		print '<tr><td>'.$langs->trans("StatusProsp").'</td><td>'.$object->getLibProspCommStatut(4, $object->cacheprospectstatus[$object->stcomm_id]['label']);
+		print ' &nbsp; &nbsp; ';
+		print '<div class="floatright">';
+		foreach ($object->cacheprospectstatus as $key => $val)
+		{
 			$titlealt = 'default';
 			if (!empty($val['code']) && !in_array($val['code'], array('ST_NO', 'ST_NEVER', 'ST_TODO', 'ST_PEND', 'ST_DONE'))) $titlealt = $val['label'];
 			if ($object->stcomm_id != $val['id']) print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&stcomm='.$val['code'].'&action=setstcomm&token='.newToken().'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
 		}
-        print '</div></td></tr>';
-        print "</table>";
+		print '</div></td></tr>';
+		print "</table>";
 	}
 
 	print '</div><div class="fichehalfright"><div class="ficheaddleft">';
@@ -618,10 +639,11 @@ if ($object->id > 0)
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
 		// Box factures
-		$tmp = $object->getOutstandingBills();
+		$tmp = $object->getOutstandingBills('customer', 0);
 		$outstandingOpened = $tmp['opened'];
 		$outstandingTotal = $tmp['total_ht'];
 		$outstandingTotalIncTax = $tmp['total_ttc'];
+
 		$text = $langs->trans("OverAllInvoices");
 		$link = DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id;
 		$icon = 'bill';
@@ -647,6 +669,24 @@ if ($object->id > 0)
 		$boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
 		$boxstat .= '</div>';
 		if ($link) $boxstat .= '</a>';
+
+		$tmp = $object->getOutstandingBills('customer', 1);
+		$outstandingOpenedLate = $tmp['opened'];
+		if ($outstandingOpened != $outstandingOpenedLate && !empty($outstandingOpenedLate)) {
+			$warn = '';
+			if ($object->outstanding_limit != '' && $object->outstanding_limit < $outstandingOpenedLate) {
+				$warn = ' ' . img_warning($langs->trans("OutstandingBillReached"));
+			}
+			$text = $langs->trans("CurrentOutstandingBillLate");
+			$link = DOL_URL_ROOT . '/compta/recap-compta.php?socid=' . $object->id;
+			$icon = 'bill';
+			if ($link) $boxstat .= '<a href="' . $link . '" class="boxstatsindicator thumbstat nobold nounderline">';
+			$boxstat .= '<div class="boxstats" title="' . dol_escape_htmltag($text) . '">';
+			$boxstat .= '<span class="boxstatstext">' . img_object("", $icon) . ' <span>' . $text . '</span></span><br>';
+			$boxstat .= '<span class="boxstatsindicator' . ($outstandingOpenedLate > 0 ? ' amountremaintopay' : '') . '">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency) . $warn . '</span>';
+			$boxstat .= '</div>';
+			if ($link) $boxstat .= '</a>';
+		}
 	}
 
 	$parameters = array();
@@ -670,9 +710,9 @@ if ($object->id > 0)
 		$langs->load("propal");
 
 		$sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.fk_statut, p.total_ht";
-        $sql .= ", p.tva as total_tva";
-        $sql .= ", p.total as total_ttc";
-        $sql .= ", p.ref, p.ref_client, p.remise";
+		$sql .= ", p.tva as total_tva";
+		$sql .= ", p.total as total_ttc";
+		$sql .= ", p.ref, p.ref_client, p.remise";
 		$sql .= ", p.datep as dp, p.fin_validite as date_limit";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
 		$sql .= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
@@ -686,17 +726,17 @@ if ($object->id > 0)
 			$propal_static = new Propal($db);
 
 			$num = $db->num_rows($resql);
-            if ($num > 0)
-            {
-            	print '<div class="div-table-responsive-no-min">';
-            	print '<table class="noborder centpercent lastrecordtable">';
+			if ($num > 0)
+			{
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-                print '<tr class="liste_titre">';
-    			print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-    			print '</tr></table></td>';
-    			print '</tr>';
-            }
+				print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastPropals", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->id.'">'.$langs->trans("AllPropals").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/comm/propal/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table></td>';
+				print '</tr>';
+			}
 
 			$i = 0;
 			while ($i < $num && $i < $MAXLIST)
@@ -704,17 +744,17 @@ if ($object->id > 0)
 				$objp = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                $propal_static->id = $objp->propalid;
-                $propal_static->ref = $objp->ref;
-                $propal_static->ref_client = $objp->ref_client;
-                $propal_static->total_ht = $objp->total_ht;
-                $propal_static->total_tva = $objp->total_tva;
-                $propal_static->total_ttc = $objp->total_ttc;
-                print $propal_static->getNomUrl(1);
-                if (($db->jdate($objp->date_limit) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == $propal_static::STATUS_VALIDATED) {
-                    print " ".img_warning();
-                }
+				print '<td class="nowrap">';
+				$propal_static->id = $objp->propalid;
+				$propal_static->ref = $objp->ref;
+				$propal_static->ref_client = $objp->ref_client;
+				$propal_static->total_ht = $objp->total_ht;
+				$propal_static->total_tva = $objp->total_tva;
+				$propal_static->total_ttc = $objp->total_ttc;
+				print $propal_static->getNomUrl(1);
+				if (($db->jdate($objp->date_limit) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == $propal_static::STATUS_VALIDATED) {
+					print " ".img_warning();
+				}
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td class="right" style="min-width: 60px" class="nowrap">'.$propal_static->LibStatut($objp->fk_statut, 5).'</td></tr>';
@@ -737,12 +777,12 @@ if ($object->id > 0)
 	 */
 	if (!empty($conf->commande->enabled) && $user->rights->commande->lire)
 	{
-        $sql = "SELECT s.nom, s.rowid";
-        $sql .= ", c.rowid as cid, c.total_ht";
-        $sql .= ", c.tva as total_tva";
-        $sql .= ", c.total_ttc";
-        $sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
-        $sql .= ", c.date_commande as dc";
+		$sql = "SELECT s.nom, s.rowid";
+		$sql .= ", c.rowid as cid, c.total_ht";
+		$sql .= ", c.tva as total_tva";
+		$sql .= ", c.total_ttc";
+		$sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
+		$sql .= ", c.date_commande as dc";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
 		$sql .= " WHERE c.fk_soc = s.rowid ";
 		$sql .= " AND s.rowid = ".$object->id;
@@ -795,8 +835,8 @@ if ($object->id > 0)
 				$commande_static->billed = $objp->billed;
 
 				print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                print $commande_static->getNomUrl(1);
+				print '<td class="nowrap">';
+				print $commande_static->getNomUrl(1);
 				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td class="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut, $objp->facture, 5).'</td></tr>';
@@ -814,78 +854,78 @@ if ($object->id > 0)
 		}
 	}
 
-    /*
+	/*
      *   Latest shipments
      */
-    if (!empty($conf->expedition->enabled) && $user->rights->expedition->lire)
-    {
-        $sql = 'SELECT e.rowid as id';
-        $sql .= ', e.ref';
-        $sql .= ', e.date_creation';
-        $sql .= ', e.fk_statut as statut';
-        $sql .= ', s.nom';
-        $sql .= ', s.rowid as socid';
-        $sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
-        $sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
-        $sql .= " AND e.entity IN (".getEntity('expedition').")";
-        $sql .= ' GROUP BY e.rowid';
-        $sql .= ', e.ref';
-        $sql .= ', e.date_creation';
-        $sql .= ', e.fk_statut';
-        $sql .= ', s.nom';
-        $sql .= ', s.rowid';
-        $sql .= " ORDER BY e.date_creation DESC";
+	if (!empty($conf->expedition->enabled) && $user->rights->expedition->lire)
+	{
+		$sql = 'SELECT e.rowid as id';
+		$sql .= ', e.ref';
+		$sql .= ', e.date_creation';
+		$sql .= ', e.fk_statut as statut';
+		$sql .= ', s.nom';
+		$sql .= ', s.rowid as socid';
+		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".$object->id;
+		$sql .= " AND e.entity IN (".getEntity('expedition').")";
+		$sql .= ' GROUP BY e.rowid';
+		$sql .= ', e.ref';
+		$sql .= ', e.date_creation';
+		$sql .= ', e.fk_statut';
+		$sql .= ', s.nom';
+		$sql .= ', s.rowid';
+		$sql .= " ORDER BY e.date_creation DESC";
 
-        $resql = $db->query($sql);
-        if ($resql)
-        {
-        	$sendingstatic = new Expedition($db);
+		$resql = $db->query($sql);
+		if ($resql)
+		{
+			$sendingstatic = new Expedition($db);
 
-        	$num = $db->num_rows($resql);
-            if ($num > 0) {
-            	print '<div class="div-table-responsive-no-min">';
-            	print '<table class="noborder centpercent lastrecordtable">';
+			$num = $db->num_rows($resql);
+			if ($num > 0) {
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder centpercent lastrecordtable">';
 
-                print '<tr class="liste_titre">';
-                print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
-                print '</tr></table></td>';
-                print '</tr>';
-            }
+				print '<tr class="liste_titre">';
+				print '<td colspan="4"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastSendings", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/expedition/list.php?socid='.$object->id.'">'.$langs->trans("AllSendings").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/expedition/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '</tr></table></td>';
+				print '</tr>';
+			}
 
-            $i = 0;
-            while ($i < $num && $i < $MAXLIST)
-            {
-                $objp = $db->fetch_object($resql);
+			$i = 0;
+			while ($i < $num && $i < $MAXLIST)
+			{
+				$objp = $db->fetch_object($resql);
 
-                $sendingstatic->id = $objp->id;
-                $sendingstatic->ref = $objp->ref;
+				$sendingstatic->id = $objp->id;
+				$sendingstatic->ref = $objp->ref;
 
-                print '<tr class="oddeven">';
-                print '<td class="nowrap">';
-                print $sendingstatic->getNomUrl(1);
-                print '</td>';
-                if ($objp->date_creation > 0) {
-                    print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
-                } else {
-                    print '<td class="right"><b>!!!</b></td>';
-                }
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">';
+				print $sendingstatic->getNomUrl(1);
+				print '</td>';
+				if ($objp->date_creation > 0) {
+					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
+				} else {
+					print '<td class="right"><b>!!!</b></td>';
+				}
 
-                print '<td class="nowrap right" width="100" >'.$sendingstatic->LibStatut($objp->statut, 5).'</td>';
-                print "</tr>\n";
-                $i++;
-            }
-            $db->free($resql);
+				print '<td class="nowrap right" width="100" >'.$sendingstatic->LibStatut($objp->statut, 5).'</td>';
+				print "</tr>\n";
+				$i++;
+			}
+			$db->free($resql);
 
-            if ($num > 0)
-            {
-                print "</table>";
-                print '</div>';
-            }
-        } else {
-            dol_print_error($db);
-        }
-    }
+			if ($num > 0)
+			{
+				print "</table>";
+				print '</div>';
+			}
+		} else {
+			dol_print_error($db);
+		}
+	}
 
 	/*
 	 * Latest contracts
@@ -910,7 +950,7 @@ if ($object->id > 0)
 				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
+				print '<tr class="liste_titre">';
 				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastContracts", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td>';
 				print '<td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->id.'">'.$langs->trans("AllContracts").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
 				//print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/contract/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"),'stats').'</a></td>';
@@ -987,7 +1027,7 @@ if ($object->id > 0)
 				print '<div class="div-table-responsive-no-min">';
 				print '<table class="noborder centpercent lastrecordtable">';
 
-			    print '<tr class="liste_titre">';
+				print '<tr class="liste_titre">';
 				print '<td colspan="3"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastInterventions", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/fichinter/list.php?socid='.$object->id.'">'.$langs->trans("AllInterventions").'<span class="badge marginleftonlyshort">'.$num.'</span></td>';
 				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/fichinter/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table></td>';
@@ -1000,11 +1040,11 @@ if ($object->id > 0)
 				$objp = $db->fetch_object($resql);
 
 				$fichinter_static->id = $objp->id;
-                $fichinter_static->statut = $objp->fk_statut;
+				$fichinter_static->statut = $objp->fk_statut;
 
 				print '<tr class="oddeven">';
 				print '<td class="nowrap"><a href="'.DOL_URL_ROOT.'/fichinter/card.php?id='.$objp->id.'">'.img_object($langs->trans("ShowPropal"), "propal").' '.$objp->ref.'</a></td>'."\n";
-                //print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
+				//print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
 				print '<td class="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
 				print '<td class="nowrap right" style="min-width: 60px">'.$fichinter_static->getLibStatut(5).'</td>'."\n";
 				print '</tr>';
@@ -1130,10 +1170,10 @@ if ($object->id > 0)
 	 */
 	if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	{
-        $sql = 'SELECT f.rowid as facid, f.ref, f.type';
-        $sql .= ', f.total as total_ht';
-        $sql .= ', f.tva as total_tva';
-        $sql .= ', f.total_ttc';
+		$sql = 'SELECT f.rowid as facid, f.ref, f.type';
+		$sql .= ', f.total as total_ht';
+		$sql .= ', f.tva as total_tva';
+		$sql .= ', f.total_ttc';
 		$sql .= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as statut';
 		$sql .= ', s.nom, s.rowid as socid';
 		$sql .= ', SUM(pf.amount) as am';
@@ -1159,7 +1199,7 @@ if ($object->id > 0)
 
 				print '<tr class="liste_titre">';
 				print '<td colspan="5"><table width="100%" class="nobordernopadding"><tr><td>'.$langs->trans("LastCustomersBills", ($num <= $MAXLIST ? "" : $MAXLIST)).'</td><td class="right"><a class="notasortlink" href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$object->id.'">'.$langs->trans("AllBills").'<span class="badge marginleftonlyshort">'.$num.'</span></a></td>';
-                print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
+				print '<td width="20px" class="right"><a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$object->id.'">'.img_picto($langs->trans("Statistics"), 'stats').'</a></td>';
 				print '</tr></table></td>';
 				print '</tr>';
 			}
@@ -1192,9 +1232,9 @@ if ($object->id > 0)
 
 				if (!empty($conf->global->MAIN_SHOW_PRICE_WITH_TAX_IN_SUMMARIES))
 				{
-    				print '<td class="right" style="min-width: 60px">';
-    				print price($objp->total_ttc);
-    				print '</td>';
+					print '<td class="right" style="min-width: 60px">';
+					print price($objp->total_ttc);
+					print '</td>';
 				}
 
 				print '<td class="nowrap right" style="min-width: 60px">'.($facturestatic->LibStatut($objp->paye, $objp->statut, 5, $objp->am)).'</td>';
@@ -1228,79 +1268,79 @@ if ($object->id > 0)
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
 
-    if (empty($reshook))
-    {
-        if ($object->status != 1)
-        {
-            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
-        }
+	if (empty($reshook))
+	{
+		if ($object->status != 1)
+		{
+			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
+		}
 
-    	if (!empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status == 1)
-    	{
-    		$langs->load("propal");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
-    	}
+		if (!empty($conf->propal->enabled) && $user->rights->propal->creer && $object->status == 1)
+		{
+			$langs->load("propal");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddProp").'</a></div>';
+		}
 
-    	if (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1)
-    	{
-    		$langs->load("orders");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
-    	}
+		if (!empty($conf->commande->enabled) && $user->rights->commande->creer && $object->status == 1)
+		{
+			$langs->load("orders");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddOrder").'</a></div>';
+		}
 
-    	if ($user->rights->contrat->creer && $object->status == 1)
-    	{
-    		$langs->load("contracts");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
-    	}
+		if ($user->rights->contrat->creer && $object->status == 1)
+		{
+			$langs->load("contracts");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddContract").'</a></div>';
+		}
 
-    	if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status == 1)
-    	{
-    		$langs->load("fichinter");
-    		print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
-    	}
+		if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer && $object->status == 1)
+		{
+			$langs->load("fichinter");
+			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddIntervention").'</a></div>';
+		}
 
-    	// Add invoice
-    	if ($user->socid == 0)
-    	{
-    		if (!empty($conf->deplacement->enabled) && $object->status == 1)
-    		{
-    			$langs->load("trips");
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
-    		}
+		// Add invoice
+		if ($user->socid == 0)
+		{
+			if (!empty($conf->deplacement->enabled) && $object->status == 1)
+			{
+				$langs->load("trips");
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
+			}
 
-    		if (!empty($conf->facture->enabled) && $object->status == 1)
-    		{
-    			if (empty($user->rights->facture->creer))
-    			{
-    			    print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			} else {
-    				$langs->loadLangs(array("orders", "bills"));
+			if (!empty($conf->facture->enabled) && $object->status == 1)
+			{
+				if (empty($user->rights->facture->creer))
+				{
+					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+				} else {
+					$langs->loadLangs(array("orders", "bills"));
 
-    				if (!empty($conf->commande->enabled))
-    				{
-    				    if ($object->client != 0 && $object->client != 2) {
-    					    if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    					    else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
-    				    } else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    				}
+					if (!empty($conf->commande->enabled))
+					{
+						if ($object->client != 0 && $object->client != 2) {
+							if (!empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+							else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+						} else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+					}
 
-    				if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
-    				else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
-    			}
-    		}
-    	}
+					if ($object->client != 0 && $object->client != 2) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a></div>';
+					else print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyMustBeEditAsCustomer")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
+				}
+			}
+		}
 
-    	// Add action
-    	if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
-    	{
-    		if ($user->rights->agenda->myactions->create)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
-    		} else {
-    			print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
-    		}
-    	}
-    }
+		// Add action
+		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1)
+		{
+			if ($user->rights->agenda->myactions->create)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a></div>';
+			}
+		}
+	}
 
 	print '</div>';
 
@@ -1310,14 +1350,14 @@ if ($object->id > 0)
 		show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
 	}
 
-    if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
-    {
-        print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
+	if (!empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+	{
+		print load_fiche_titre($langs->trans("ActionsOnCompany"), '', '');
 
-        // List of todo actions
+		// List of todo actions
 		show_actions_todo($conf, $langs, $db, $object);
 
-        // List of done actions
+		// List of done actions
 		show_actions_done($conf, $langs, $db, $object);
 	}
 } else {
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index cfd2d67ea4e..b305858bd93 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -179,9 +179,9 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				$companystatic->code_compta = $obj->code_compta;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$propalstatic->getNomUrl(1).'</td>';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 16).'</td>';
-				print '<td class="nowrap right">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$propalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowrap right tdamount">'.price((!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc)).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -243,9 +243,9 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 				$companystatic->email = $obj->email;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$supplierproposalstatic->getNomUrl(1).'</td>';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 16).'</td>';
-				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$supplierproposalstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -308,9 +308,9 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				$companystatic->entity = $obj->entity;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$orderstatic->getNomUrl(1).'</td>';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 16).'</td>';
-				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$orderstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -373,9 +373,9 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$companystatic->email = $obj->email;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$supplierorderstatic->getNomUrl(1).'</td>';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 16).'</td>';
-				print '<td class="nowrap right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$supplierorderstatic->getNomUrl(1).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td class="nowrap right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '</tr>';
 
 				$i++;
@@ -441,9 +441,29 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 				$companystatic->email = $objp->email;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 48).'</td>';
-				print '<td class="right" nowrap>'.$companystatic->getLibCustProspStatut().'</td>';
-				print '<td class="right" nowrap>'.dol_print_date($db->jdate($objp->tms), 'day').'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				print '<td class="nowrap">';
+				//print $companystatic->getLibCustProspStatut();
+
+				$obj = $companystatic;
+				$s = '';
+				if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+				{
+					$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
+				}
+				if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+				{
+					$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
+				}
+				/*
+				if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
+				{
+					$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
+				}*/
+				print $s;
+
+				print '</td>';
+				print '<td class="right nowrap tddate">'.dol_print_date($db->jdate($objp->tms), 'day').'</td>';
 				print '</tr>';
 
 				$i++;
@@ -464,7 +484,7 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
  * Last suppliers
  */
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $user->rights->societe->lire) {
-	$sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm, s.code_fournisseur, s.entity, s.email";
+	$sql = "SELECT s.nom as name, s.rowid, s.datec as dc, s.canvas, s.tms as dm, s.code_fournisseur, s.entity, s.email, s.fournisseur";
 	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 	if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE s.entity IN (".getEntity($companystatic->element).")";
@@ -477,7 +497,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$resql = $db->query($sql);
 	if ($resql) {
 		$num = $db->num_rows($resql);
-		startSimpleTable($langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)), "societe/list.php", "type=f");
+		startSimpleTable($langs->trans("BoxTitleLastModifiedSuppliers", min($max, $num)), "societe/list.php", "type=f", 1);
 
 		if ($num) {
 			$i = 0;
@@ -491,17 +511,37 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$companystatic->canvas = $objp->canvas;
 				$companystatic->entity = $objp->entity;
 				$companystatic->email = $objp->email;
+				$companystatic->fournisseur = $objp->fournisseur;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'supplier', 44).'</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$companystatic->getNomUrl(1, 'supplier').'</td>';
+				print '<td>';
+
+				$obj = $companystatic;
+				$s = '';
+				/*if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+				{
+					$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
+				}
+				if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
+				{
+					$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
+				}*/
+				if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
+				{
+					$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
+				}
+				print $s;
+
+				print '</td>';
+				print '<td class="right tddate">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
 				print '</tr>';
 
 				$i++;
 			}
 		}
 
-		addSummaryTableLine(2, $num);
+		addSummaryTableLine(3, $num);
 		finishSimpleTable(true);
 
 		$db->free($resql);
@@ -566,8 +606,11 @@ if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire && 0) { // T
 				$companystatic->entity = $objp->entity;
 				$companystatic->email = $objp->email;
 
+				$staticcontrat->id = $obj->contratid;
+				$staticcontrat->ref = $obj->ref;
+
 				print '<tr class="oddeven">';
-				print '<td><a href=\"../contrat/card.php?id=".$obj->contratid."\">".img_object($langs->trans("ShowContract","contract"), "contract")." ".$obj->ref."</a></td>';
+				print '<td>'.$staticcontrat->getNomUrl(1).'</td>';
 				print '<td>'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
 				print '<td class="right">'.$staticcontrat->LibStatut($obj->statut, 3).'</td>';
 				print '</tr>';
@@ -657,8 +700,8 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				print '</td>';
 
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
-				print '<td class="right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="right tddate">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
+				print '<td class="right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
 
 				print '</tr>';
@@ -758,8 +801,8 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				print '</td>';
 
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
-				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
-				print '<td class="right">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
+				print '<td class="right tddate">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
+				print '<td class="right tdamount">'.price(!empty($conf->global->MAIN_DASHBOARD_USE_TOTAL_HT) ? $obj->total_ht : $obj->total_ttc).'</td>';
 				print '<td align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>';
 
 				print '</tr>';
diff --git a/htdocs/comm/mailing/advtargetemailing.php b/htdocs/comm/mailing/advtargetemailing.php
index 29b06819e9e..64e7df053ea 100644
--- a/htdocs/comm/mailing/advtargetemailing.php
+++ b/htdocs/comm/mailing/advtargetemailing.php
@@ -426,7 +426,7 @@ if ($object->fetch($id) >= 0) {
 	print $form->showrefnav($object, 'id', $linkback);
 	print '</td></tr>';
 
-	print '<tr><td>'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+	print '<tr><td>'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 78b9dea4bc6..4fe46859dc7 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -135,7 +135,7 @@ if (empty($reshook))
 			$from     = $object->email_from;
 			$replyto  = $object->email_replyto;
 			$errorsto = $object->email_errorsto;
-			// Le message est-il en html
+			// Is the message in html
 			$msgishtml = -1; // Unknown by default
 			if (preg_match('/[\s\t]*<html>/i', $message)) $msgishtml = 1;
 
@@ -144,8 +144,8 @@ if (empty($reshook))
 
 			$nbok = 0; $nbko = 0;
 
-			// On choisit les mails non deja envoyes pour ce mailing (statut=0)
-			// ou envoyes en erreur (statut=-1)
+			// We choose mails not already sent for this mailing (statut=0)
+			// or sent in error (statut=-1)
 			$sql = "SELECT mc.rowid, mc.fk_mailing, mc.lastname, mc.firstname, mc.email, mc.other, mc.source_url, mc.source_id, mc.source_type, mc.tag";
 			$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
 			$sql .= " WHERE mc.statut < 1 AND mc.fk_mailing = ".$object->id;
@@ -155,7 +155,7 @@ if (empty($reshook))
 			$resql = $db->query($sql);
 			if ($resql)
 			{
-				$num = $db->num_rows($resql); // nb of possible recipients
+				$num = $db->num_rows($resql); // Number of possible recipients
 
 				if ($num)
 				{
@@ -163,7 +163,7 @@ if (empty($reshook))
 
 					$now = dol_now();
 
-					// Positionne date debut envoi
+					// Positioning date of start sending
 					$sql = "UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi='".$db->idate($now)."' WHERE rowid=".$object->id;
 					$resql2 = $db->query($sql);
 					if (!$resql2)
@@ -273,7 +273,7 @@ if (empty($reshook))
 							}
 						}
 
-						// Fabrication du mail
+						// Mail making
 						$trackid = 'emailing-'.$obj->fk_mailing.'-'.$obj->rowid;
 						$mail = new CMailFile($newsubject, $sendto, $from, $newmessage, $arr_file, $arr_mime, $arr_name, '', '', 0, $msgishtml, $errorsto, $arr_css, $trackid, '', 'emailing');
 
@@ -408,15 +408,15 @@ if (empty($reshook))
 
 		if (!$error)
 		{
-			// Le message est-il en html
-			$msgishtml = -1; // Inconnu par defaut
+			// Is the message in html
+			$msgishtml = -1; // Unknow by default
 			if (preg_match('/[\s\t]*<html>/i', $object->body)) $msgishtml = 1;
 
 			// other are set at begin of page
 			$object->substitutionarrayfortest['__EMAIL__'] = $object->sendto;
 			$object->substitutionarrayfortest['__MAILTOEMAIL__'] = '<a href="mailto:'.$object->sendto.'">'.$object->sendto.'</a>';
 
-			// Pratique les substitutions sur le sujet et message
+			// Subject and message substitutions
 	        complete_substitutions_array($object->substitutionarrayfortest, $langs);
 			$tmpsujet = make_substitutions($object->sujet, $object->substitutionarrayfortest);
 			$tmpbody = make_substitutions($object->body, $object->substitutionarrayfortest);
@@ -426,7 +426,7 @@ if (empty($reshook))
 			$arr_name = array();
 			$arr_css  = array();
 
-	        // Ajout CSS
+	        // Add CSS
 	        if (!empty($object->bgcolor)) $arr_css['bgcolor'] = (preg_match('/^#/', $object->bgcolor) ? '' : '#').$object->bgcolor;
 	        if (!empty($object->bgimage)) $arr_css['bgimage'] = $object->bgimage;
 
@@ -465,13 +465,13 @@ if (empty($reshook))
 		$object->email_from     = GETPOST("from");
 		$object->email_replyto  = GETPOST("replyto");
 		$object->email_errorsto = GETPOST("errorsto");
-		$object->titre          = GETPOST("titre");
+		$object->title          = GETPOST("title");
 		$object->sujet          = GETPOST("sujet");
 		$object->body           = GETPOST("bodyemail", 'restricthtml');
 		$object->bgcolor        = GETPOST("bgcolor");
 		$object->bgimage        = GETPOST("bgimage");
 
-		if (!$object->titre) {
+		if (!$object->title) {
 			$mesgs[] = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		}
 		if (!$object->sujet) {
@@ -496,16 +496,16 @@ if (empty($reshook))
 	}
 
 	// Action update description of emailing
-	if ($action == 'settitre' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
+	if ($action == 'settitle' || $action == 'setemail_from' || $action == 'setreplyto' || $action == 'setemail_errorsto')
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
 
-		if ($action == 'settitre') $object->titre = trim(GETPOST('titre', 'alpha'));
+		if ($action == 'settitle') $object->title = trim(GETPOST('title', 'alpha'));
 		elseif ($action == 'setemail_from') $object->email_from = trim(GETPOST('email_from', 'alpha'));
 		elseif ($action == 'setemail_replyto') $object->email_replyto = trim(GETPOST('email_replyto', 'alpha'));
 		elseif ($action == 'setemail_errorsto') {
             $object->email_errorsto = trim(GETPOST('email_errorsto', 'alpha'));
-        } elseif ($action == 'settitre' && empty($object->titre)) {
+        } elseif ($action == 'settitle' && empty($object->title)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailTitle"));
 		} elseif ($action == 'setfrom' && empty($object->email_from)) {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentities("MailFrom"));
@@ -540,7 +540,7 @@ if (empty($reshook))
 		$action = "edit";
 	}
 
-	// Action remove file
+	// Action of file remove
 	if (!empty($_POST["removedfile"]))
 	{
 		$upload_dir = $conf->mailing->dir_output."/".get_exdir($object->id, 2, 0, 1, $object, 'mailing');
@@ -552,7 +552,7 @@ if (empty($reshook))
 		$action = "edit";
 	}
 
-	// Action update emailing
+	// Action of emailing update
 	if ($action == 'update' && empty($_POST["removedfile"]) && empty($_POST["cancel"]))
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -592,7 +592,7 @@ if (empty($reshook))
 		}
 	}
 
-	// Action confirmation validation
+	// Action of validation confirmation
 	if ($action == 'confirm_valid' && $confirm == 'yes')
 	{
 		if ($object->id > 0)
@@ -606,7 +606,7 @@ if (empty($reshook))
 		}
 	}
 
-	// Action confirmation validation
+	// Action of validation confirmation
 	if ($action == 'confirm_settodraft' && $confirm == 'yes')
 	{
 		if ($object->id > 0)
@@ -652,7 +652,7 @@ if (empty($reshook))
 		}
 	}
 
-	// Action confirmation suppression
+	// Action of delete confirmation
 	if ($action == 'confirm_delete' && $confirm == 'yes')
 	{
 		if ($object->delete($object->id))
@@ -736,7 +736,7 @@ if ($action == 'create')
 	print '</table>';
 
 	print '<div style="padding-top: 10px">';
-	// Editeur wysiwyg
+	// wysiwyg editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtml'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 	$doleditor->Create();
@@ -759,7 +759,7 @@ if ($action == 'create')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("SetToDraft"), $langs->trans("ConfirmUnvalidateEmailing"), "confirm_settodraft", '', '', 1);
 		}
-		// Confirmation validation of mailing
+		// Confirmation of mailing validation
 		if ($action == 'valid')
 		{
 			print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ValidMailing"), $langs->trans("ConfirmValidMailing"), "confirm_valid", '', '', 1);
@@ -779,7 +779,7 @@ if ($action == 'create')
 			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
 
 			/*
-			 * Mailing en mode visu
+			 * View mode mailing
 			 */
 			if ($action == 'sendall')
 			{
@@ -854,9 +854,9 @@ if ($action == 'create')
 
 			// Description
 			print '<tr><td class="titlefield">';
-			print $form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
+			print $form->editfieldkey("MailTitle", 'title', $object->title, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td><td>';
-			print $form->editfieldval("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
+			print $form->editfieldval("MailTitle", 'title', $object->title, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
 			print '</td></tr>';
 
 			// From
@@ -883,7 +883,7 @@ if ($action == 'create')
 			}
 			print '</td></tr>';
 
-			// Nb of distinct emails
+			// Number of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
 			print '</td><td colspan="3">';
@@ -929,12 +929,12 @@ if ($action == 'create')
 				array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContent"), 'value' => 1),
 				array('type' => 'checkbox', 'name' => 'clone_receivers', 'label' => $langs->trans("CloneReceivers"), 'value' => 0)
 				);
-				// Paiement incomplet. On demande si motif = escompte ou autre
+				// Incomplete payment. On demande si motif = escompte ou autre
 				print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneEMailing', $object->ref), 'confirm_clone', $formquestion, 'yes', 2, 240);
 			}
 
 			/*
-			 * Boutons d'action
+			 * Actions Buttons
 			 */
 
 			if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test')))
@@ -1021,7 +1021,7 @@ if ($action == 'create')
 				print '</div>';
 			}
 
-			// Affichage formulaire de TEST
+			// Display of the TEST form
 			if ($action == 'test')
 			{
 			    print '<div id="formmailbeforetitle" name="formmailbeforetitle"></div>';
@@ -1029,7 +1029,7 @@ if ($action == 'create')
 
 			    dol_fiche_head(null, '', '', -1);
 
-			    // Create l'objet formulaire mail
+			    // Create mail form object
 				include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
 				$formmail->fromname = $object->email_from;
@@ -1046,9 +1046,9 @@ if ($action == 'create')
 				$formmail->withbodyreadonly = 1;
 				$formmail->withcancel = 1;
 				$formmail->withdeliveryreceipt = 0;
-				// Tableau des substitutions
+				// Table of substitutions
 				$formmail->substit = $object->substitutionarrayfortest;
-				// Tableau des parametres complementaires du post
+				// Table of post's complementary params
 				$formmail->param["action"] = "send";
 				$formmail->param["models"] = 'none';
 				$formmail->param["mailid"] = $object->id;
@@ -1109,7 +1109,7 @@ if ($action == 'create')
 			if (empty($object->bgcolor) || strtolower($object->bgcolor) == 'ffffff')	// CKEditor does not apply the color of the div into its content area
 			{
 				$readonly = 1;
-				// Editeur wysiwyg
+				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', false, true, empty($conf->global->FCKEDITOR_ENABLE_MAILING) ? 0 : 1, 20, '90%', $readonly);
 				$doleditor->Create();
@@ -1119,7 +1119,7 @@ if ($action == 'create')
 			dol_fiche_end();
 		} else {
 			/*
-			 * Mailing en mode edition (CKeditor or HTML source)
+			 * Edition mode mailing (CKeditor or HTML source)
 			 */
 
 			dol_fiche_head($head, 'card', $langs->trans("Mailing"), -1, 'email');
@@ -1144,13 +1144,13 @@ if ($action == 'create')
 			*/
 
 			// Topic
-			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 			// From
 			print '<tr><td class="titlefield">'.$langs->trans("MailFrom").'</td><td colspan="3">'.dol_print_email($object->email_from, 0, 0, 0, 0, 1).'</td></tr>';
 			// To
 			print '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td colspan="3">'.dol_print_email($object->email_errorsto, 0, 0, 0, 0, 1).'</td></tr>';
 
-			// Nb of distinct emails
+			// Number of distinct emails
 			print '<tr><td>';
 			print $langs->trans("TotalNbOfDistinctRecipients");
 			print '</td><td colspan="3">';
@@ -1267,14 +1267,14 @@ if ($action == 'create')
 
 			if ($action == 'edit')
 			{
-				// Editeur wysiwyg
+				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
 				$doleditor->Create();
 			}
 			if ($action == 'edithtml')
 			{
-				// Editor HTML source
+				// HTML source editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, 'ace', 20, '90%');
 				$doleditor->Create(0, '', false, 'HTML Source', 'php');
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index ef2f3cc772e..ff9bb98f639 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -237,7 +237,7 @@ if ($object->fetch($id) >= 0)
 
 	print '<table class="border centpercent tableforfield">';
 
-	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->titre.'</td></tr>';
+	print '<tr><td class="titlefield">'.$langs->trans("MailTitle").'</td><td colspan="3">'.$object->title.'</td></tr>';
 
 	print '<tr><td>'.$langs->trans("MailFrom").'</td><td colspan="3">';
 	$emailarray = CMailFile::getArrayAddress($object->email_from);
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 1bb4864876c..a4088975bd2 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -46,7 +46,7 @@ class Mailing extends CommonObject
 	 */
 	public $picto = 'email';
 
-	public $titre;
+	public $title;
 	public $sujet;
 	public $body;
 	public $nbemail;
@@ -115,7 +115,7 @@ class Mailing extends CommonObject
 
 		$this->db->begin();
 
-		$this->titre = trim($this->titre);
+		$this->title = trim($this->title);
 		$this->email_from = trim($this->email_from);
 
 		if (!$this->email_from)
@@ -130,9 +130,9 @@ class Mailing extends CommonObject
 		$sql .= " (date_creat, fk_user_creat, entity)";
 		$sql .= " VALUES ('".$this->db->idate($now)."', ".$user->id.", ".$conf->entity.")";
 
-		if (!$this->titre)
+		if (!$this->title)
 		{
-			$this->titre = $langs->trans("NoTitle");
+			$this->title = $langs->trans("NoTitle");
 		}
 
 		dol_syslog("Mailing::Create", LOG_DEBUG);
@@ -167,7 +167,7 @@ class Mailing extends CommonObject
 	public function update($user)
 	{
 		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing ";
-		$sql .= " SET titre = '".$this->db->escape($this->titre)."'";
+		$sql .= " SET titre = '".$this->db->escape($this->title)."'";
 		$sql .= ", sujet = '".$this->db->escape($this->sujet)."'";
 		$sql .= ", body = '".$this->db->escape($this->body)."'";
 		$sql .= ", email_from = '".$this->db->escape($this->email_from)."'";
@@ -198,7 +198,7 @@ class Mailing extends CommonObject
 	{
 		global $conf;
 
-		$sql = "SELECT m.rowid, m.titre, m.sujet, m.body, m.bgcolor, m.bgimage";
+		$sql = "SELECT m.rowid, m.titre as title, m.sujet, m.body, m.bgcolor, m.bgimage";
 		$sql .= ", m.email_from, m.email_replyto, m.email_errorsto";
 		$sql .= ", m.statut, m.nbemail";
 		$sql .= ", m.fk_user_creat, m.fk_user_valid";
@@ -221,11 +221,11 @@ class Mailing extends CommonObject
 				$this->ref = $obj->rowid;
 				$this->statut = $obj->statut;
 				$this->nbemail = $obj->nbemail;
-				$this->titre = $obj->titre;
+				$this->title = $obj->title;
 
 				$this->sujet = $obj->sujet;
-				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401))) {
-					$this->body = dol_html_entity_decode($obj->body, ENT_COMPAT | ENT_HTML401);
+				if (!empty($conf->global->FCKEDITOR_ENABLE_MAILING) && dol_textishtml(dol_html_entity_decode($obj->body, ENT_COMPAT|ENT_HTML5))) {
+					$this->body = dol_html_entity_decode($obj->body, ENT_COMPAT|ENT_HTML5);
 				} else {
 					$this->body = $obj->body;
 				}
@@ -283,7 +283,7 @@ class Mailing extends CommonObject
 		$object->statut = 0;
 
 		// Clear fields
-		$object->titre = $langs->trans("CopyOf").' '.$object->titre.' '.dol_print_date(dol_now());
+		$object->title = $langs->trans("CopyOf").' '.$object->title.' '.dol_print_date(dol_now());
 
 		// If no option copy content
 		if (empty($option1))
diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php
index cf439e4314b..ddcdaabf14e 100644
--- a/htdocs/comm/mailing/index.php
+++ b/htdocs/comm/mailing/index.php
@@ -182,7 +182,7 @@ if ($result) {
 
 	        print '<tr class="oddeven">';
 	        print '<td class="nowrap">'.$mailstatic->getNomUrl(1).'</td>';
-	        print '<td>'.dol_trunc($obj->titre, 38).'</td>';
+	        print '<td>'.dol_trunc($obj->title, 38).'</td>';
 	        print '<td class="center">'.dol_print_date($db->jdate($obj->date_creat), 'day').'</td>';
 	        print '<td class="center">'.($obj->nbemail ? $obj->nbemail : "0").'</td>';
 	        print '<td class="right">'.$mailstatic->LibStatut($obj->statut, 5).'</td>';
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index d22dd130507..525064942a6 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -238,7 +238,7 @@ if ($resql)
 		print $email->getNomUrl(1);
 		print '</td>';
 
-		print '<td>'.$obj->titre.'</td>';
+		print '<td>'.$obj->title.'</td>';
 		// Date creation
 
 		print '<td class="center">';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9caf2c8483c..48c2bbbaa62 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -372,13 +372,13 @@ if (empty($reshook))
 				$object->ref_client = GETPOST('ref_client');
 				$object->datep = $datep;
 				$object->date_livraison = $date_delivery;
-				$object->availability_id = GETPOST('availability_id');
-				$object->demand_reason_id = GETPOST('demand_reason_id');
-				$object->fk_delivery_address = GETPOST('fk_address');
+				$object->availability_id = GETPOST('availability_id', 'int');
+				$object->demand_reason_id = GETPOST('demand_reason_id', 'int');
+				$object->fk_delivery_address = GETPOST('fk_address', 'int');
 				$object->shipping_method_id = GETPOST('shipping_method_id', 'int');
-				$object->duree_validite = GETPOST('duree_validite');
-				$object->cond_reglement_id = GETPOST('cond_reglement_id');
-				$object->mode_reglement_id = GETPOST('mode_reglement_id');
+				$object->duree_validite = price2num(GETPOST('duree_validite', 'alpha'));
+				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
 				$object->fk_account = GETPOST('fk_account', 'int');
 				$object->contact_id = GETPOST('contactid', 'int');
 				$object->fk_project = GETPOST('projectid', 'int');
@@ -1504,9 +1504,6 @@ if ($action == 'create')
 		print $soc->getNomUrl(1);
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		print '</td>';
-		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
-			$shipping_method_id = $soc->shipping_method_id;
-		}
 	} else {
 		print '<td>';
 		print $form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500');
@@ -1553,7 +1550,7 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Validaty duration
-	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" class="width50" value="'.(GETPOST('duree_validite', 'int') ? GETPOST('duree_validite', 'int') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
+	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td><input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
 
 	// Terms of payment
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
@@ -1587,6 +1584,9 @@ if ($action == 'create')
 
 	// Shipping Method
 	if (!empty($conf->expedition->enabled)) {
+		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
+			$shipping_method_id = $soc->shipping_method_id;
+		}
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
 		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1);
 		print '</td></tr>';
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 90e60bf6adb..f2275d59021 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
  */
 class Proposals extends DolibarrApi
 {
-    /**
+	/**
 	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
 	 */
 	static $FIELDS = array(
@@ -65,60 +65,60 @@ class Proposals extends DolibarrApi
 	 */
 	public function get($id, $contact_list = 1)
 	{
-        return $this->_fetch($id, '', '', $contact_list);
+		return $this->_fetch($id, '', '', $contact_list);
 	}
 
-    /**
-     * Get properties of an proposal object by ref
-     *
-     * Return an array with proposal informations
-     *
-     * @param       string		$ref			Ref of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref/{ref}
-     *
-     * @throws 	RestException
-     */
-    public function getByRef($ref, $contact_list = 1)
-    {
-        return $this->_fetch('', $ref, '', $contact_list);
-    }
+	/**
+	 * Get properties of an proposal object by ref
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       string		$ref			Ref of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref/{ref}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRef($ref, $contact_list = 1)
+	{
+		return $this->_fetch('', $ref, '', $contact_list);
+	}
 
-    /**
-     * Get properties of an proposal object by ref_ext
-     *
-     * Return an array with proposal informations
-     *
-     * @param       string		$ref_ext			External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @url GET    ref_ext/{ref_ext}
-     *
-     * @throws 	RestException
-     */
-    public function getByRefExt($ref_ext, $contact_list = 1)
-    {
-        return $this->_fetch('', '', $ref_ext, $contact_list);
-    }
+	/**
+	 * Get properties of an proposal object by ref_ext
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       string		$ref_ext			External reference of object
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    ref_ext/{ref_ext}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getByRefExt($ref_ext, $contact_list = 1)
+	{
+		return $this->_fetch('', '', $ref_ext, $contact_list);
+	}
 
-    /**
-     * Get properties of an proposal object
-     *
-     * Return an array with proposal informations
-     *
-     * @param       int         $id             ID of order
+	/**
+	 * Get properties of an proposal object
+	 *
+	 * Return an array with proposal informations
+	 *
+	 * @param       int         $id             ID of order
 	 * @param		string		$ref			Ref of object
 	 * @param		string		$ref_ext		External reference of object
-     * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
-    {
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	private function _fetch($id, $ref = '', $ref_ext = '', $contact_list = 1)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->lire) {
 			throw new RestException(401);
 		}
@@ -151,8 +151,8 @@ class Proposals extends DolibarrApi
 	 * @param string    $sqlfilters         Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
 	 * @return  array                       Array of order objects
 	 */
-    public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
-    {
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
 		global $db, $conf;
 
 		$obj_ret = array();
@@ -201,8 +201,8 @@ class Proposals extends DolibarrApi
 			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-        dol_syslog("API Rest request");
-        $result = $this->db->query($sql);
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
 
 		if ($result)
 		{
@@ -235,13 +235,13 @@ class Proposals extends DolibarrApi
 	 * @param   array   $request_data   Request data
 	 * @return  int     ID of proposal
 	 */
-    public function post($request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401, "Insuffisant rights");
-        }
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
 
 		foreach ($request_data as $field => $value) {
 			$this->propal->$field = $value;
@@ -258,7 +258,7 @@ class Proposals extends DolibarrApi
 		}
 
 		return $this->propal->id;
-    }
+	}
 
 	/**
 	 * Get lines of a commercial proposal
@@ -269,26 +269,26 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 */
-    public function getLines($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->lire) {
-            throw new RestException(401);
-        }
+	public function getLines($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->lire) {
+			throw new RestException(401);
+		}
 
-	    $result = $this->propal->fetch($id);
-	    if (!$result) {
-		    throw new RestException(404, 'Commercial Proposal not found');
-	    }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-		    throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-	    }
-	    $this->propal->getLinesArray();
-	    $result = array();
-	    foreach ($this->propal->lines as $line) {
-		    array_push($result, $this->_cleanObjectDatas($line));
-	    }
-	    return $result;
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->propal->getLinesArray();
+		$result = array();
+		foreach ($this->propal->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
 	}
 
 	/**
@@ -309,50 +309,50 @@ class Proposals extends DolibarrApi
 
 		$result = $this->propal->fetch($id);
 		if (!$result) {
-		    throw new RestException(404, 'Commercial Proposal not found');
+			throw new RestException(404, 'Commercial Proposal not found');
 		}
 
 		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $request_data = (object) $request_data;
+		$request_data = (object) $request_data;
 
-        $updateRes = $this->propal->addline(
-                        $request_data->desc,
-                        $request_data->subprice,
-                        $request_data->qty,
-                        $request_data->tva_tx,
-                        $request_data->localtax1_tx,
-                        $request_data->localtax2_tx,
-                        $request_data->fk_product,
-                        $request_data->remise_percent,
-                        'HT',
-                        0,
-                        $request_data->info_bits,
-                        $request_data->product_type,
-                        $request_data->rang,
-                        $request_data->special_code,
-      					$request_data->fk_parent_line,
-                        $request_data->fk_fournprice,
-                        $request_data->pa_ht,
-                        $request_data->label,
-                        $request_data->date_start,
-                        $request_data->date_end,
-                        $request_data->array_options,
-                        $request_data->fk_unit,
-                        $request_data->origin,
-                        $request_data->origin_id,
-                        $request_data->multicurrency_subprice,
-                        $request_data->fk_remise_except
-        );
+		$updateRes = $this->propal->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						'HT',
+						0,
+						$request_data->info_bits,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+	  					$request_data->fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$request_data->origin,
+						$request_data->origin_id,
+						$request_data->multicurrency_subprice,
+						$request_data->fk_remise_except
+		);
 
-        if ($updateRes > 0) {
-            return $updateRes;
-        } else {
-            throw new RestException(400, $this->propal->error);
-        }
-    }
+		if ($updateRes > 0) {
+			return $updateRes;
+		} else {
+			throw new RestException(400, $this->propal->error);
+		}
+	}
 
 	/**
 	 * Update a line of given commercial proposal
@@ -388,37 +388,37 @@ class Proposals extends DolibarrApi
 	  		throw new RestException(404, 'Proposal line not found');
 	  	}
 
-        $updateRes = $this->propal->updateline(
-            $lineid,
-            isset($request_data->subprice) ? $request_data->subprice : $propalline->subprice,
-            isset($request_data->qty) ? $request_data->qty : $propalline->qty,
-            isset($request_data->remise_percent) ? $request_data->remise_percent : $propalline->remise_percent,
-            isset($request_data->tva_tx) ? $request_data->tva_tx : $propalline->tva_tx,
-            isset($request_data->localtax1_tx) ? $request_data->localtax1_tx : $propalline->localtax1_tx,
-            isset($request_data->localtax2_tx) ? $request_data->localtax2_tx : $propalline->localtax2_tx,
-            isset($request_data->desc) ? $request_data->desc : $propalline->desc,
-            'HT',
-            isset($request_data->info_bits) ? $request_data->info_bits : $propalline->info_bits,
-            isset($request_data->special_code) ? $request_data->special_code : $propalline->special_code,
-            isset($request_data->fk_parent_line) ? $request_data->fk_parent_line : $propalline->fk_parent_line,
-            0,
-            isset($request_data->fk_fournprice) ? $request_data->fk_fournprice : $propalline->fk_fournprice,
-            isset($request_data->pa_ht) ? $request_data->pa_ht : $propalline->pa_ht,
-            isset($request_data->label) ? $request_data->label : $propalline->label,
-            isset($request_data->product_type) ? $request_data->product_type : $propalline->product_type,
-            isset($request_data->date_start) ? $request_data->date_start : $propalline->date_start,
-            isset($request_data->date_end) ? $request_data->date_end : $propalline->date_end,
-            isset($request_data->array_options) ? $request_data->array_options : $propalline->array_options,
-            isset($request_data->fk_unit) ? $request_data->fk_unit : $propalline->fk_unit,
-            isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice
-        );
+		$updateRes = $this->propal->updateline(
+			$lineid,
+			isset($request_data->subprice) ? $request_data->subprice : $propalline->subprice,
+			isset($request_data->qty) ? $request_data->qty : $propalline->qty,
+			isset($request_data->remise_percent) ? $request_data->remise_percent : $propalline->remise_percent,
+			isset($request_data->tva_tx) ? $request_data->tva_tx : $propalline->tva_tx,
+			isset($request_data->localtax1_tx) ? $request_data->localtax1_tx : $propalline->localtax1_tx,
+			isset($request_data->localtax2_tx) ? $request_data->localtax2_tx : $propalline->localtax2_tx,
+			isset($request_data->desc) ? $request_data->desc : $propalline->desc,
+			'HT',
+			isset($request_data->info_bits) ? $request_data->info_bits : $propalline->info_bits,
+			isset($request_data->special_code) ? $request_data->special_code : $propalline->special_code,
+			isset($request_data->fk_parent_line) ? $request_data->fk_parent_line : $propalline->fk_parent_line,
+			0,
+			isset($request_data->fk_fournprice) ? $request_data->fk_fournprice : $propalline->fk_fournprice,
+			isset($request_data->pa_ht) ? $request_data->pa_ht : $propalline->pa_ht,
+			isset($request_data->label) ? $request_data->label : $propalline->label,
+			isset($request_data->product_type) ? $request_data->product_type : $propalline->product_type,
+			isset($request_data->date_start) ? $request_data->date_start : $propalline->date_start,
+			isset($request_data->date_end) ? $request_data->date_end : $propalline->date_end,
+			isset($request_data->array_options) ? $request_data->array_options : $propalline->array_options,
+			isset($request_data->fk_unit) ? $request_data->fk_unit : $propalline->fk_unit,
+			isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice
+		);
 
-	    if ($updateRes > 0) {
-		    $result = $this->get($id);
-		    unset($result->line);
-		    return $this->_cleanObjectDatas($result);
-	    }
-	    return false;
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
 	}
 
 	/**
@@ -432,13 +432,13 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
+	 * @throws RestException 401
+	 * @throws RestException 404
 	 */
-    public function deleteLine($id, $lineid)
-    {
+	public function deleteLine($id, $lineid)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
+			throw new RestException(401);
 		}
 
 		$result = $this->propal->fetch($id);
@@ -460,7 +460,7 @@ class Proposals extends DolibarrApi
 		}
 	}
 
-    /**
+	/**
 	 * Add a contact type of given commercial proposal
 	 *
 	 * @param int    $id             Id of commercial proposal to update
@@ -471,66 +471,66 @@ class Proposals extends DolibarrApi
 	 *
 	 * @return int
 	 *
-     * @throws RestException 401
-     * @throws RestException 404
+	 * @throws RestException 401
+	 * @throws RestException 404
 	 */
-    public function postContact($id, $contactid, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	public function postContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->propal->fetch($id);
+		$result = $this->propal->fetch($id);
 
 		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-        if (!in_array($type, array('BILLING', 'SHIPPING', 'CUSTOMER'), true)) {
-            throw new RestException(500, 'Availables types: BILLING, SHIPPING OR CUSTOMER');
-        }
+		if (!in_array($type, array('BILLING', 'SHIPPING', 'CUSTOMER'), true)) {
+			throw new RestException(500, 'Availables types: BILLING, SHIPPING OR CUSTOMER');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        $result = $this->propal->add_contact($contactid, $type, 'external');
+		$result = $this->propal->add_contact($contactid, $type, 'external');
 
-        if (!$result) {
-            throw new RestException(500, 'Error when added the contact');
-        }
+		if (!$result) {
+			throw new RestException(500, 'Error when added the contact');
+		}
 
-        return $this->propal;
-    }
+		return $this->propal;
+	}
 
-     /**
-	 * Delete a contact type of given commercial proposal
-	 *
-	 * @param int    $id             Id of commercial proposal to update
-	 * @param int    $contactid      Row key of the contact in the array contact_ids.
-	 * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
-	 *
-	 * @url	DELETE {id}/contact/{contactid}/{type}
-	 *
-	 * @return int
-	 *
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-	 */
-    public function deleteContact($id, $contactid, $type)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	 /**
+	  * Delete a contact type of given commercial proposal
+	  *
+	  * @param int    $id             Id of commercial proposal to update
+	  * @param int    $contactid      Row key of the contact in the array contact_ids.
+	  * @param string $type           Type of the contact (BILLING, SHIPPING, CUSTOMER).
+	  *
+	  * @url	DELETE {id}/contact/{contactid}/{type}
+	  *
+	  * @return int
+	  *
+	  * @throws RestException 401
+	  * @throws RestException 404
+	  * @throws RestException 500
+	  */
+	public function deleteContact($id, $contactid, $type)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
-        $result = $this->propal->fetch($id);
+		$result = $this->propal->fetch($id);
 
 		if (!$result) {
 			throw new RestException(404, 'Proposal not found');
 		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -547,7 +547,7 @@ class Proposals extends DolibarrApi
 		}
 
 		return $this->_cleanObjectDatas($this->propal);
-    }
+	}
 
 	/**
 	 * Update commercial proposal general fields (won't touch lines of commercial proposal)
@@ -556,12 +556,12 @@ class Proposals extends DolibarrApi
 	 * @param array $request_data   Datas
 	 *
 	 * @return int
-     */
-    public function put($id, $request_data = null)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
 
 		$result = $this->propal->fetch($id);
 		if (!$result) {
@@ -631,14 +631,14 @@ class Proposals extends DolibarrApi
 	}
 
 	/**
-	* Set a proposal to draft
-	*
-	* @param   int     $id             Order ID
-	*
-	* @url POST    {id}/settodraft
-	*
-	* @return  array
-	*/
+	 * Set a proposal to draft
+	 *
+	 * @param   int     $id             Order ID
+	 *
+	 * @url POST    {id}/settodraft
+	 *
+	 * @return  array
+	 */
 	public function settodraft($id)
 	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
@@ -690,14 +690,14 @@ class Proposals extends DolibarrApi
 	 * @url POST    {id}/validate
 	 *
 	 * @throws RestException 304
-     * @throws RestException 401
-     * @throws RestException 404
-     * @throws RestException 500
-     *
-     * @return array
-     */
-    public function validate($id, $notrigger = 0)
-    {
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 *
+	 * @return array
+	 */
+	public function validate($id, $notrigger = 0)
+	{
 		if (!DolibarrApiAccess::$user->rights->propal->creer) {
 			throw new RestException(401);
 		}
@@ -718,19 +718,19 @@ class Proposals extends DolibarrApi
 			throw new RestException(500, 'Error when validating Commercial Proposal: '.$this->propal->error);
 		}
 
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Commercial Proposal not found');
-        }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->propal->fetchObjectLinked();
+		$this->propal->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->propal);
-    }
+		return $this->_cleanObjectDatas($this->propal);
+	}
 
 	/**
 	 * Close (Accept or refuse) a quote / commercial proposal
@@ -780,47 +780,47 @@ class Proposals extends DolibarrApi
 		return $this->_cleanObjectDatas($this->propal);
 	}
 
-    /**
-     * Set a commercial proposal billed. Could be also called setbilled
-     *
-     * @param   int     $id             Commercial proposal ID
-     *
-     * @url POST    {id}/setinvoiced
-     *
-     * @return  array
-     */
-    public function setinvoiced($id)
-    {
-        if (!DolibarrApiAccess::$user->rights->propal->creer) {
-            throw new RestException(401);
-        }
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Commercial Proposal not found');
-        }
+	/**
+	 * Set a commercial proposal billed. Could be also called setbilled
+	 *
+	 * @param   int     $id             Commercial proposal ID
+	 *
+	 * @url POST    {id}/setinvoiced
+	 *
+	 * @return  array
+	 */
+	public function setinvoiced($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->propal->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Commercial Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
-        if ($result < 0) {
-            throw new RestException(500, 'Error : '.$this->propal->error);
-        }
+		$result = $this->propal->classifyBilled(DolibarrApiAccess::$user);
+		if ($result < 0) {
+			throw new RestException(500, 'Error : '.$this->propal->error);
+		}
 
-        $result = $this->propal->fetch($id);
-        if (!$result) {
-            throw new RestException(404, 'Proposal not found');
-        }
+		$result = $this->propal->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Proposal not found');
+		}
 
-        if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
-            throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-        }
+		if (!DolibarrApi::_checkAccessToResource('propal', $this->propal->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
 
-        $this->propal->fetchObjectLinked();
+		$this->propal->fetchObjectLinked();
 
-        return $this->_cleanObjectDatas($this->propal);
-    }
+		return $this->_cleanObjectDatas($this->propal);
+	}
 
 
 	/**
@@ -842,25 +842,25 @@ class Proposals extends DolibarrApi
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-    /**
-     * Clean sensible object datas
-     *
-     * @param   object  $object    Object to clean
-     * @return    array    Array of cleaned object properties
-     */
-    protected function _cleanObjectDatas($object)
-    {
-        // phpcs:enable
-        $object = parent::_cleanObjectDatas($object);
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   object  $object    Object to clean
+	 * @return    array    Array of cleaned object properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
 
-        unset($object->note);
-        unset($object->name);
-        unset($object->lastname);
-        unset($object->firstname);
-        unset($object->civility_id);
-        unset($object->address);
+		unset($object->note);
+		unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->address);
 
-        return $object;
-    }
+		return $object;
+	}
 }
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 7e34ac6fc3c..a09844da014 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -193,8 +193,12 @@ class Propal extends CommonObject
 
 	public $address_type;
 	public $address;
+
 	public $availability_id;
 	public $availability_code;
+
+	public $duree_validite;
+
 	public $demand_reason_id;
 	public $demand_reason_code;
 
@@ -3153,7 +3157,7 @@ class Propal extends CommonObject
 		$sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
 		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
-		$sql .= " WHERE c.rowid = ".$id;
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
 
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 747bb75433c..8f71447ab0b 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -79,7 +79,7 @@ class PropaleStats extends Stats
     		$this->field = 'total_ht';
     		$this->field_line = 'total_ht';
 
-    		$this->where .= " p.fk_statut > 0";
+    		//$this->where .= " p.fk_statut > 0";
         }
         if ($mode == 'supplier')
         {
@@ -91,10 +91,10 @@ class PropaleStats extends Stats
     		$this->field = 'total_ht';
     		$this->field_line = 'total_ht';
 
-    		$this->where .= " p.fk_statut > 0"; // Validated, accepted, refused and closed
+    		//$this->where .= " p.fk_statut > 0"; // Validated, accepted, refused and closed
         }
 		//$this->where.= " AND p.fk_soc = s.rowid AND p.entity = ".$conf->entity;
-		$this->where .= " AND p.entity IN (".getEntity('propal').")";
+        $this->where .= ($this->where ? ' AND ' : '')."p.entity IN (".getEntity('propal').")";
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		if ($this->socid)
 		{
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e50078993f8..f9ccc0837c8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -542,7 +542,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -551,7 +551,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 49e1141fec1..a59896c8ab6 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -86,7 +86,7 @@ if ($mode == 'customer')
 if ($mode == 'supplier')
 {
 	$picto = 'supplier_proposal';
-    $title = $langs->trans("ProposalsStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
+    $title = $langs->trans("ProposalsStatisticsSuppliers");
     $dir = $conf->supplier_proposal->dir_temp;
     $cat_type = Categorie::TYPE_SUPPLIER;
     $cat_label = $langs->trans("Category").' '.lcfirst($langs->trans("Supplier"));
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 5de377930d7..3ee5b89e01a 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1863,6 +1863,7 @@ if ($action == 'create' && $usercancreate)
 		$author = new User($db);
 		$author->fetch($object->user_author_id);
 
+		$object->fetch_thirdparty();
 		$res = $object->fetch_optionals();
 
 		$head = commande_prepare_head($object);
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 7ccbd8950b5..b9fbe8a6c1d 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -573,13 +573,13 @@ class Orders extends DolibarrApi
 		 $contacts = $this->commande->liste_contact();
 
 		foreach ($contacts as $contact) {
-            if ($contact['id'] == $contactid && $contact['code'] == $type) {
-		        $result = $this->commande->delete_contact($contact['rowid']);
+			if ($contact['id'] == $contactid && $contact['code'] == $type) {
+				$result = $this->commande->delete_contact($contact['rowid']);
 
-		        if (!$result) {
-                    throw new RestException(500, 'Error when deleted the contact');
-                }
-		    }
+				if (!$result) {
+					throw new RestException(500, 'Error when deleted the contact');
+				}
+			}
 		}
 
 		return array(
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 5c314226214..70df565cd2b 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -3531,6 +3531,8 @@ class Commande extends CommonOrder
 		$billedtext = '';
 		if (empty($donotshowbilled)) $billedtext .= ($billed ? ' - '.$langs->trans("Billed") : '');
 
+		$labelTooltip = '';
+
 		if ($status == self::STATUS_CANCELED) {
 			$labelStatus = $langs->trans('StatusOrderCanceled');
 			$labelStatusShort = $langs->trans('StatusOrderCanceledShort');
@@ -3544,8 +3546,9 @@ class Commande extends CommonOrder
 			$labelStatusShort = $langs->trans('StatusOrderValidatedShort').$billedtext;
 			$statusType = 'status1';
 		} elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
-			$labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
+			$labelStatus = $langs->trans('StatusOrderSent').$billedtext;
 			$labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
+			$labelTooltip = $langs->trans("StatusOrderSent").' - '.$langs->trans("DateDeliveryPlanned").dol_print_date($this->date_livraison).$billedtext;
 			$statusType = 'status4';
 		} elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 			$labelStatus = $langs->trans('StatusOrderToBill');
@@ -3553,11 +3556,11 @@ class Commande extends CommonOrder
 			$statusType = 'status4';
 		} elseif ($status == self::STATUS_CLOSED && ($billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 			$labelStatus = $langs->trans('StatusOrderProcessed').$billedtext;
-			$labelStatusShort = $langs->trans('StatusOrderProcessed').$billedtext;
+			$labelStatusShort = $langs->trans('StatusOrderProcessedShort').$billedtext;
 			$statusType = 'status6';
 		} elseif ($status == self::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 			$labelStatus = $langs->trans('StatusOrderDelivered');
-			$labelStatusShort = $langs->trans('StatusOrderDelivered');
+			$labelStatusShort = $langs->trans('StatusOrderDeliveredShort');
 			$statusType = 'status6';
 		} else {
 			$labelStatus = $langs->trans('Unknown');
@@ -3566,7 +3569,7 @@ class Commande extends CommonOrder
 			$mode = 0;
 		}
 
-		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode, '', array('tooltip' => $labelTooltip));
 	}
 
 
@@ -3991,11 +3994,6 @@ class OrderLine extends CommonOrderLine
 	public $fk_parent_line;
 	public $fk_facture;
 
-	/**
-	 * @var string Order lines label
-	 */
-	public $label;
-
 	public $ref_ext;
 
 	public $fk_remise_except;
@@ -4046,7 +4044,7 @@ class OrderLine extends CommonOrderLine
 		$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.fk_product_fournisseur_price as fk_fournprice, cd.buy_price_ht as pa_ht, cd.rang, cd.special_code,';
 		$sql .= ' cd.fk_unit,';
 		$sql .= ' cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc,';
-		$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc, p.tobatch as product_tobatch,';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc, p.tobatch as product_tobatch,';
 		$sql .= ' cd.date_start, cd.date_end';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
@@ -4090,9 +4088,9 @@ class OrderLine extends CommonOrderLine
 			$this->rang = $objp->rang;
 
 			$this->ref = $objp->product_ref; // deprecated
-			$this->product_ref = $objp->product_ref;
-			$this->libelle = $objp->product_libelle; // deprecated
-			$this->product_label = $objp->product_libelle;
+
+			$this->product_ref      = $objp->product_ref;
+			$this->product_label    = $objp->product_label;
 			$this->product_desc     = $objp->product_desc;
 			$this->product_tobatch  = $objp->product_tobatch;
 			$this->fk_unit          = $objp->fk_unit;
diff --git a/htdocs/commande/class/commandestats.class.php b/htdocs/commande/class/commandestats.class.php
index 5af5fb23060..c9dc5eaffa8 100644
--- a/htdocs/commande/class/commandestats.class.php
+++ b/htdocs/commande/class/commandestats.class.php
@@ -77,7 +77,7 @@ class CommandeStats extends Stats
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
-			$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
+			//$this->where .= " c.fk_statut > 0"; // Not draft and not cancelled
 		} elseif ($mode == 'supplier')
 		{
 			$object = new CommandeFournisseur($this->db);
@@ -85,10 +85,10 @@ class CommandeStats extends Stats
 			$this->from_line = MAIN_DB_PREFIX.$object->table_element_line." as tl";
 			$this->field = 'total_ht';
 			$this->field_line = 'total_ht';
-			$this->where .= " c.fk_statut > 2"; // Only approved & ordered
+			//$this->where .= " c.fk_statut > 2"; // Only approved & ordered
 		}
 		//$this->where.= " AND c.fk_soc = s.rowid AND c.entity = ".$conf->entity;
-		$this->where .= ' AND c.entity IN ('.getEntity('commande').')';
+		$this->where .= ($this->where ? ' AND ' : ''). 'c.entity IN ('.getEntity('commande').')';
 
 		if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
 		if ($this->socid)
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index ae73b23a876..cb9e06a5549 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -46,7 +46,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills'));
+$langs->loadLangs(array("orders", 'sendings', 'deliveries', 'companies', 'compta', 'bills', 'stocks'));
 
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
@@ -593,7 +593,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -602,7 +602,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -680,9 +680,9 @@ if ($resql)
 		print '</td>';
 	}
 	// Town
-	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.$search_town.'"></td>';
+	if (!empty($arrayfields['s.town']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_town" value="'.dol_escape_htmltag($search_town).'"></td>';
 	// Zip
-	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.$search_zip.'"></td>';
+	if (!empty($arrayfields['s.zip']['checked'])) print '<td class="liste_titre"><input class="flat" type="text" size="4" name="search_zip" value="'.dol_escape_htmltag($search_zip).'"></td>';
 	// State
 	if (!empty($arrayfields['state.nom']['checked']))
 	{
@@ -844,14 +844,14 @@ if ($resql)
 			-3=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort").'+'.$langs->trans("StatusOrderDelivered"),
 			Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
 		);
-		print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+		print $form->selectarray('search_status', $liststatus, $search_status, -4, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
 		print '</td>';
 	}
 	// Status billed
 	if (!empty($arrayfields['c.facture']['checked']))
 	{
 		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
-		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
 	// Action column
@@ -905,6 +905,7 @@ if ($resql)
 	$total = 0;
 	$subtotal = 0;
 	$productstat_cache = array();
+	$productstat_cachevirtual = array();
 	$getNomUrl_cache = array();
 
 	$generic_commande = new Commande($db);
@@ -962,7 +963,6 @@ if ($resql)
 			// Show shippable Icon (create subloop, so may be slow)
 			if ($conf->stock->enabled)
 			{
-				$langs->load("stocks");
 				if (($obj->fk_statut > 0) && ($obj->fk_statut < 3))
 				{
 					$numlines = count($generic_commande->lines); // Loop on each line of order
@@ -986,16 +986,16 @@ if ($resql)
 
 							if (empty($conf->global->SHIPPABLE_ORDER_ICON_IN_LIST))  // Default code. Default is when this option is not set, setting it create strange result
 							{
-								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
-								$text_info .= ' - '.$langs->trans("Stock").': '.$generic_product->stock_reel;
-								$text_info .= ' - '.$langs->trans("VirtualStock").': '.$generic_product->stock_theorique;
+								$text_info .= $generic_commande->lines[$lig]->qty.' X '.$generic_commande->lines[$lig]->product_ref.'&nbsp;'.dol_trunc($generic_commande->lines[$lig]->product_label, 25);
+								$text_info .= ' - '.$langs->trans("Stock").': <span class="'.($generic_product->stock_reel > 0 ? 'ok' : 'error').'">'.$generic_product->stock_reel.'</span>';
+								$text_info .= ' - '.$langs->trans("VirtualStock").': <span class="'.($generic_product->stock_theorique > 0 ? 'ok' : 'error').'">'.$generic_product->stock_theorique.'</span>';
 								$text_info .= '<br>';
 
 								if ($generic_commande->lines[$lig]->qty > $generic_product->stock_reel)
 								{
 									$notshippable++;
 								}
-							} else {  // Detailed code, looks bugged
+							} else {  // Detailed virtual stock, looks bugged, uncomplete and need heavy load.
 								// stock order and stock order_supplier
 								$stock_order = 0;
 								$stock_order_supplier = 0;
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 346b5549bfd..2b2402fd9de 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -81,7 +81,7 @@ $dir = $conf->commande->dir_temp;
 if ($mode == 'supplier')
 {
 	$picto = 'supplier_order';
-    $title = $langs->trans("OrdersStatisticsSuppliers").' ('.$langs->trans("SentToSuppliers").")";
+    $title = $langs->trans("OrdersStatisticsSuppliers");
     $dir = $conf->fournisseur->commande->dir_temp;
 }
 
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 2a8a0358744..020b85bf06c 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -149,7 +149,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 		// Customer invoices
 		if (GETPOST('selectinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
+			$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 		    $sql .= " WHERE datef between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -158,7 +158,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Vendor invoices
 		if (GETPOST('selectsupplierinvoices')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
 		    $sql .= " WHERE datef between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -167,7 +167,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Expense reports
 		if (GETPOST('selectexpensereports')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 		    $sql .= " WHERE date_fin between  ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -176,16 +176,16 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Donations
 		if (GETPOST('selectdonations')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
 		    $sql .= " WHERE datedon between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
 		    $sql .= " AND t.fk_statut <> ".Don::STATUS_DRAFT;
 		}
-	    // Paiements of salaries
+	    // Payments of salaries
 		if (GETPOST('selectpaymentsofsalaries')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname)  as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -194,7 +194,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Social contributions
 		if (GETPOST('selectsocialcontributions')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
 		    $sql .= " WHERE t.date_ech between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -203,7 +203,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
 	    // Various payments
 		if (GETPOST('selectvariouspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
+			$sql .= " SELECT t.rowid as id, t.entity, t.ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -211,7 +211,7 @@ if (($action == 'searchfiles' || $action == 'dl')) {
         // Loan payments
 		if (GETPOST('selectloanspayment')) {
 			if (!empty($sql)) $sql .= " UNION ALL";
-			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_tva, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
+			$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
 		    $sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
 		    $sql .= " WHERE datep between ".$wheretail;
 		    $sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
@@ -525,6 +525,9 @@ dol_fiche_head($head, 'AccountancyFiles');
 print '<form name="searchfiles" action="?action=searchfiles" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
+print '<span class="opacitymedium">'.$langs->trans("ExportAccountingSourceDocHelp", $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Journals")).'</span><br>';
+print '<br>';
+
 print $langs->trans("ReportPeriod").': '.$form->selectDate($date_start, 'date_start', 0, 0, 0, "", 1, 1, 0);
 print ' - '.$form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0)."\n</a>";
 
@@ -578,7 +581,7 @@ if (!empty($date_start) && !empty($date_stop))
     foreach ($listofchoices as $choice => $val) {
     	$param .= '&'.$choice.'='.(GETPOST($choice, 'int') ? 1 : 0);
     }
-    print '<form name="dl" action="?action=dl" method="POST" >'."\n";
+    print '<form name="dl" action="'.$_SERVER["PHP_SELF"].'?action=dl" method="POST">'."\n";
     print '<input type="hidden" name="token" value="'.currentToken().'">';
 
     echo dol_print_date($date_start, 'day')." - ".dol_print_date($date_stop, 'day');
@@ -589,7 +592,7 @@ if (!empty($date_start) && !empty($date_stop))
     	print '<input type="hidden" name="'.$choice.'" value="'.GETPOST($choice).'">';
     }
 
-    print '<input class="butAction" type="submit" value="'.$langs->trans("Download").'" />';
+    print '<input class="butAction butDownload" type="submit" value="'.$langs->trans("Download").'" />';
     print '</form>'."\n";
 
     print '<br>';
@@ -603,13 +606,14 @@ if (!empty($date_start) && !empty($date_stop))
     print_liste_field_titre($arrayfields['ref']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
     print '<td>'.$langs->trans("Document").'</td>';
     print '<td>'.$langs->trans("Paid").'</td>';
-    print '<td align="right">'.$langs->trans("TotalHT").'</td>';
-    print '<td align="right">'.$langs->trans("TotalTTC").'</td>';
-    print '<td align="right">'.$langs->trans("TotalVAT").'</td>';
+    print '<td align="right">'.$langs->trans("TotalHT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+    print '<td align="right">'.$langs->trans("TotalTTC").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
+    print '<td align="right">'.$langs->trans("TotalVAT").($conf->multicurrency->enabled ? ' ('.$conf->currency.')' : '').'</td>';
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
 	print '<td class="center">'.$langs->trans("Code").'</td>';
 	print '<td class="center">'.$langs->trans("Country").'</td>';
     print '<td class="center">'.$langs->trans("VATIntra").'</td>';
+    if ($conf->multicurrency->enabled) print '<td class="center">'.$langs->trans("Currency").'</td>';
     print '</tr>';
     if ($result)
     {
@@ -617,7 +621,11 @@ if (!empty($date_start) && !empty($date_stop))
 
         if (empty($TData))
         {
-            print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td></tr>';
+            print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td>';
+            if (! empty($conf->multicurrency->enabled)) {
+            	print '<td></td>';
+            }
+            print '</tr>';
         } else {
             // Sort array by date ASC to calculate balance
 
@@ -644,7 +652,7 @@ if (!empty($date_start) && !empty($date_stop))
                 print dol_print_date($data['date'], 'day');
                 print "</td>\n";
 
-                // Date
+                // Date due
                 print '<td class="center">';
                 print dol_print_date($data['date_due'], 'day');
                 print "</td>\n";
@@ -655,10 +663,18 @@ if (!empty($date_start) && !empty($date_stop))
 				if ($data['item'] == 'Invoice') {
 					$invoice->id = $data['id'];
                 	$invoice->ref = $data['ref'];
+                	$invoice->total_ht = $data['amount_ht'];
+                	$invoice->total_ttc = $data['amount_ttc'];
+                	$invoice->total_tva = $data['amount_vat'];
+                	$invoice->multicurrency_code = $data['currency'];
                 	print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} elseif ($data['item'] == 'SupplierInvoice') {
                 	$supplier_invoice->id = $data['id'];
                 	$supplier_invoice->ref = $data['ref'];
+                	$supplier_invoice->total_ht = $data['amount_ht'];
+                	$supplier_invoice->total_ttc = $data['amount_ttc'];
+                	$supplier_invoice->total_tva = $data['amount_vat'];
+                	$supplier_invoice->multicurrency_code = $data['currency'];
                 	print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
 				} elseif ($data['item'] == 'ExpenseReport') {
                     $expensereport->id = $data['id'];
@@ -709,7 +725,7 @@ if (!empty($date_start) && !empty($date_stop))
                 // Total VAT
                 print '<td align="right">'.price($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'])."</td>\n";
 
-                print '<td>'.$data['thirdparty_name']."</td>\n";
+                print '<td class="tdoverflowmax150" title="'.$data['thirdparty_name'].'">'.$data['thirdparty_name']."</td>\n";
 
                 print '<td class="center">'.$data['thirdparty_code']."</td>\n";
 
@@ -727,6 +743,10 @@ if (!empty($date_start) && !empty($date_stop))
                     $totalVAT_debit -= $data['amount_vat'];
                 }
 
+                if (! empty($conf->multicurrency->enabled)) {
+                	print '<td class="center">'.$data['currency']."</td>\n";
+                }
+
                 print "</tr>\n";
             }
 
@@ -737,6 +757,9 @@ if (!empty($date_start) && !empty($date_stop))
             print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
             print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
             print '<td colspan="4"></td>';
+            if (! empty($conf->multicurrency->enabled)) {
+            	print '<td></td>';
+            }
             print "</tr>\n";
             // Total debits
             print '<tr class="liste_total">';
@@ -745,6 +768,9 @@ if (!empty($date_start) && !empty($date_stop))
             print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
             print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
             print '<td colspan="4"></td>';
+            if (! empty($conf->multicurrency->enabled)) {
+            	print '<td></td>';
+            }
             print "</tr>\n";
             // Balance
             print '<tr class="liste_total">';
@@ -753,6 +779,9 @@ if (!empty($date_start) && !empty($date_stop))
             print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
             print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
             print '<td colspan="4"></td>';
+            if (! empty($conf->multicurrency->enabled)) {
+            	print '<td></td>';
+            }
             print "</tr>\n";
         }
     }
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 974ba750dd1..0558f097121 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -109,15 +109,15 @@ if (!$sortfield) $sortfield = 'b.datev,b.dateo,b.rowid';
 $object = new Account($db);
 if ($id > 0 || !empty($ref))
 {
-    $result = $object->fetch($id, $ref);
-    $search_account = $object->id; // Force the search field on id of account
+	$result = $object->fetch($id, $ref);
+	$search_account = $object->id; // Force the search field on id of account
 
-    if (!($object->id > 0))
-    {
-    	$langs->load("errors");
-    	print($langs->trans('ErrorRecordNotFound'));
-    	exit;
-    }
+	if (!($object->id > 0))
+	{
+		$langs->load("errors");
+		print($langs->trans('ErrorRecordNotFound'));
+		exit;
+	}
 }
 
 $mode_balance_ok = false;
@@ -137,20 +137,20 @@ $extrafields->fetch_name_optionals_label('banktransaction');
 $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_');
 
 $arrayfields = array(
-    'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-    'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
-    'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
-    'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
-    'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
-    'bu.label'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>500),
-    'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
-    'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
-    'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
+	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
+	'bu.label'=>array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>500),
+	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
+	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
+	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
 	'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>1000),
 	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1001),
 	'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010),
-    'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
+	'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
 );
 // Extra fields
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0)
@@ -181,10 +181,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
 {
-    $search_dt_start = '';
-    $search_dt_end = '';
-    $search_dv_start = '';
-    $search_dv_end = '';
+	$search_dt_start = '';
+	$search_dt_end = '';
+	$search_dv_start = '';
+	$search_dv_end = '';
 	$search_type = "";
 	$search_debit = "";
 	$search_credit = "";
@@ -203,56 +203,57 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 
 if (empty($reshook))
 {
-    $objectclass = 'Account';
-    $objectlabel = 'BankTransaction';
-    $permissiontoread = $user->rights->banque->lire;
-    $permissiontodelete = $user->rights->banque->supprimer;
-    $uploaddir = $conf->bank->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	$objectclass = 'Account';
+	$objectlabel = 'BankTransaction';
+	$permissiontoread = $user->rights->banque->lire;
+	$permissiontodelete = $user->rights->banque->supprimer;
+	$uploaddir = $conf->bank->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 // Conciliation
-if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate)
+if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate
+	&& (!GETPOSTISSET('pageplusone') || (GETPOST('pageplusone') == GETPOST('pageplusoneold'))))
 {
-    $error = 0;
+	$error = 0;
 
-    // Definition, nettoyage parametres
-    $num_releve = GETPOST("num_releve", "alpha");
+	// Definition, nettoyage parametres
+	$num_releve = GETPOST("num_releve", "alpha");
 
-    if ($num_releve)
-    {
-        $bankline = new AccountLine($db);
-        if (isset($_POST['rowid']) && is_array($_POST['rowid']))
-        {
-            foreach ($_POST['rowid'] as $row)
-            {
-                if ($row > 0)
-                {
-                    $result = $bankline->fetch($row);
-                    $bankline->num_releve = $num_releve; //$_POST["num_releve"];
-                    $result = $bankline->update_conciliation($user, GETPOST("cat"), GETPOST('confirm_reconcile', 'alpha') ? 1 : 0); // If we confirm_reconcile, we set flag 'rappro' to 1.
-                    if ($result < 0)
-                    {
-                        setEventMessages($bankline->error, $bankline->errors, 'errors');
-                        $error++;
-                        break;
-                    }
-                }
-            }
-        } else {
-            $error++;
-            $langs->load("errors");
-            setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
-        }
-    } else {
-        $error++;
-        $langs->load("errors");
-        setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
-    }
+	if ($num_releve)
+	{
+		$bankline = new AccountLine($db);
+		if (isset($_POST['rowid']) && is_array($_POST['rowid']))
+		{
+			foreach ($_POST['rowid'] as $row)
+			{
+				if ($row > 0)
+				{
+					$result = $bankline->fetch($row);
+					$bankline->num_releve = $num_releve; //$_POST["num_releve"];
+					$result = $bankline->update_conciliation($user, GETPOST("cat"), GETPOST('confirm_reconcile', 'alpha') ? 1 : 0); // If we confirm_reconcile, we set flag 'rappro' to 1.
+					if ($result < 0)
+					{
+						setEventMessages($bankline->error, $bankline->errors, 'errors');
+						$error++;
+						break;
+					}
+				}
+			}
+		} else {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("NoRecordSelected"), null, 'errors');
+		}
+	} else {
+		$error++;
+		$langs->load("errors");
+		setEventMessages($langs->trans("ErrorPleaseTypeBankTransactionReportName"), null, 'errors');
+	}
 
-    if (!$error)
-    {
-    	$param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id;
+	if (!$error)
+	{
+		$param = 'action=reconcile&contextpage=banktransactionlist&id='.$id.'&search_account='.$id;
 		$param .= '&search_conciliated='.urlencode($search_conciliated);
 		if ($page) $param .= '&page='.urlencode($page);
 		if ($offset) $param .= '&offset='.urlencode($offset);
@@ -268,85 +269,85 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 		if ($search_credit) $param .= '&search_credit='.urlencode($search_credit);
 		$param .= '&sortfield='.urlencode($sortfield).'&sortorder='.urlencode($sortorder);
 		header('Location: '.$_SERVER["PHP_SELF"].'?'.$param); // To avoid to submit twice and allow the back button
-        exit;
-    }
+		exit;
+	}
 }
 
 
 if (GETPOST('save') && !$cancel && $user->rights->banque->modifier)
 {
-    $error = 0;
+	$error = 0;
 
-    if (price2num($_POST["addcredit"]) > 0)
-    {
-        $amount = price2num($_POST["addcredit"]);
-    } else {
-        $amount = - price2num($_POST["adddebit"]);
-    }
+	if (price2num(GETPOST("addcredit")) > 0)
+	{
+		$amount = price2num(GETPOST("addcredit"));
+	} else {
+		$amount = - price2num(GETPOST("adddebit"));
+	}
 
-    $operation = GETPOST("operation", 'alpha');
-    $num_chq   = GETPOST("num_chq", 'alpha');
-    $label     = GETPOST("label", 'alpha');
-    $cat1      = GETPOST("cat1", 'alpha');
+	$operation = GETPOST("operation", 'alpha');
+	$num_chq   = GETPOST("num_chq", 'alpha');
+	$label     = GETPOST("label", 'alpha');
+	$cat1      = GETPOST("cat1", 'alpha');
 
-    $bankaccountid = $id;
-    if (GETPOST('add_account', 'int') > 0) $bankaccountid = GETPOST('add_account', 'int');
+	$bankaccountid = $id;
+	if (GETPOST('add_account', 'int') > 0) $bankaccountid = GETPOST('add_account', 'int');
 
-    if (!$dateop) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-    }
-    if (!$operation) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-    }
-    if (!$label) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-    }
-    if (!$amount) {
-        $error++;
-        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
-    }
-    if (!$bankaccountid > 0)
-    {
-    	$error++;
-    	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
-    }
-    /*if (! empty($conf->accounting->enabled) && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
+	if (!$dateop) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+	}
+	if (!$operation) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+	}
+	if (!$label) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+	}
+	if (!$amount) {
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
+	}
+	if (!$bankaccountid > 0)
+	{
+		$error++;
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
+	}
+	/*if (! empty($conf->accounting->enabled) && (empty($search_accountancy_code) || $search_accountancy_code == '-1'))
     {
     	setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AccountAccounting")), null, 'errors');
     	$error++;
     }*/
 
-    if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
-    {
-    	$objecttmp = new Account($db);
-    	$objecttmp->fetch($bankaccountid);
-        $insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $search_accountancy_code);
-        if ($insertid > 0)
-        {
-            setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-            header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
-            exit;
-        } else {
-            setEventMessages($object->error, $object->errors, 'errors');
-        }
-    } else {
-        $action = 'addline';
-    }
+	if (!$error && !empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))
+	{
+		$objecttmp = new Account($db);
+		$objecttmp->fetch($bankaccountid);
+		$insertid = $objecttmp->addline($dateop, $operation, $label, $amount, $num_chq, ($cat1 > 0 ? $cat1 : 0), $user, '', '', $search_accountancy_code);
+		if ($insertid > 0)
+		{
+			setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+			header("Location: ".$_SERVER['PHP_SELF'].($id ? "?id=".$id : ''));
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		$action = 'addline';
+	}
 }
 
 if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->modifier)
 {
-    $accline = new AccountLine($db);
-    $result = $accline->fetch(GETPOST("rowid", "int"));
-    $result = $accline->delete($user);
-    if ($result <= 0) {
-    	setEventMessages($accline->error, $accline->errors, 'errors');
-    } else {
-    	setEventMessages('RecordDeleted', null, 'mesgs');
-    }
+	$accline = new AccountLine($db);
+	$result = $accline->fetch(GETPOST("rowid", "int"));
+	$result = $accline->delete($user);
+	if ($result <= 0) {
+		setEventMessages($accline->error, $accline->errors, 'errors');
+	} else {
+		setEventMessages('RecordDeleted', null, 'mesgs');
+	}
 }
 
 
@@ -419,43 +420,43 @@ if ($id > 0 || !empty($ref))
 	$helpurl = "";
 	llxHeader('', $title, $helpurl);
 
-    // Load bank groups
-    require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
-    $bankcateg = new BankCateg($db);
+	// Load bank groups
+	require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
+	$bankcateg = new BankCateg($db);
 
-    foreach ($bankcateg->fetchAll() as $bankcategory) {
-        $options[$bankcategory->id] = $bankcategory->label;
-    }
+	foreach ($bankcateg->fetchAll() as $bankcategory) {
+		$options[$bankcategory->id] = $bankcategory->label;
+	}
 
-    // Bank card
-    $head = bank_prepare_head($object);
-    dol_fiche_head($head, 'journal', $langs->trans("FinancialAccount"), 0, 'account');
+	// Bank card
+	$head = bank_prepare_head($object);
+	dol_fiche_head($head, 'journal', $langs->trans("FinancialAccount"), 0, 'account');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
-    dol_fiche_end();
+	dol_fiche_end();
 
 
-    /*
+	/*
      * Buttons actions
      */
 
-    if ($action != 'reconcile')
-    {
-        if ($object->canBeConciliated() > 0)
-        {
-            // If not cash account and can be reconciliate
-            if ($user->rights->banque->consolidate) {
-            	$newparam = $param;
-            	$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
-            	$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
-            } else {
-            	$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
-            }
-        }
-    }
+	if ($action != 'reconcile')
+	{
+		if ($object->canBeConciliated() > 0)
+		{
+			// If not cash account and can be reconciliate
+			if ($user->rights->banque->consolidate) {
+				$newparam = $param;
+				$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
+				$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$langs->trans("Conciliate").'</a>';
+			} else {
+				$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$langs->trans("Conciliate").'</a>';
+			}
+		}
+	}
 } else {
 	llxHeader('', $langs->trans("BankTransactions"), '', '', 0, 0, array(), array(), $param);
 }
@@ -538,25 +539,25 @@ $nbtotalofrecords = '';
 $nbtotalofpages = 0;
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
-    $result = $db->query($sql);
-    $nbtotalofrecords = $db->num_rows($result);
-    $nbtotalofpages = ceil($nbtotalofrecords / $limit);
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	$nbtotalofpages = ceil($nbtotalofrecords / $limit);
 }
 
 if (($id > 0 || !empty($ref)) && ((string) $page == ''))
 {
-    // We open a list of transaction of a dedicated account and no page was set by defaut
-    // We force on last page.
-    $page = ($nbtotalofpages - 1);
-    $offset = $limit * $page;
-    if ($page < 0) $page = 0;
+	// We open a list of transaction of a dedicated account and no page was set by defaut
+	// We force on last page.
+	$page = ($nbtotalofpages - 1);
+	$offset = $limit * $page;
+	if ($page < 0) $page = 0;
 }
 if ($page >= $nbtotalofpages)
 {
-    // If we made a search and result has low page than the page number we were on
-    $page = ($nbtotalofpages - 1);
-    $offset = $limit * $page;
-    if ($page < 0) $page = 0;
+	// If we made a search and result has low page than the page number we were on
+	$page = ($nbtotalofpages - 1);
+	$offset = $limit * $page;
+	if ($page < 0) $page = 0;
 }
 
 
@@ -582,23 +583,23 @@ if ($resql)
 
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 
-    // List of mass actions available
-    $arrayofmassactions = array(
-        //'presend'=>$langs->trans("SendByMail"),
-        //'builddoc'=>$langs->trans("PDFMerge"),
-    );
-    //if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
-    if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
-    $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+	// List of mass actions available
+	$arrayofmassactions = array(
+		//'presend'=>$langs->trans("SendByMail"),
+		//'builddoc'=>$langs->trans("PDFMerge"),
+	);
+	//if ($user->rights->bank->supprimer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+	if (in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-    // Confirmation delete
-    if ($action == 'delete')
-    {
-        $text = $langs->trans('ConfirmDeleteTransaction');
-        print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
-    }
+	// Confirmation delete
+	if ($action == 'delete')
+	{
+		$text = $langs->trans('ConfirmDeleteTransaction');
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&rowid='.GETPOST("rowid"), $langs->trans('DeleteTransaction'), $text, 'confirm_delete', null, '', 1);
+	}
 
-    // Lines of title fields
+	// Lines of title fields
 	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="search_form">'."\n";
 	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -607,7 +608,7 @@ if ($resql)
 	print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
 	print '<input type="hidden" name="id" value="'.$id.'">';
 	print '<input type="hidden" name="ref" value="'.$ref.'">';
 	if (GETPOST('bid')) print '<input type="hidden" name="bid" value="'.GETPOST("bid").'">';
@@ -615,54 +616,54 @@ if ($resql)
 	// Form to reconcile
 	if ($user->rights->banque->consolidate && $action == 'reconcile')
 	{
-	    print '<div class="valignmiddle inline-block" style="padding-right: 20px;">';
-	    print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
-	    print '<input class="flat" id="num_releve" name="num_releve" type="text" value="'.(GETPOST('num_releve') ?GETPOST('num_releve') : '').'" size="10">'; // The only default value is value we just entered
-	    print '</div>';
-	    if (is_array($options) && count($options))
-	    {
-	        print $langs->trans("EventualyAddCategory").': ';
-	        print Form::selectarray('cat', $options, GETPOST('cat'), 1);
-	    }
-	    print '<br><div style="margin-top: 5px;"><span class="opacitymedium">'.$langs->trans("ThenCheckLinesAndConciliate").'</span> ';
-	    print '<input class="button" name="confirm_savestatement" type="submit" value="'.$langs->trans("SaveStatementOnly").'">';
-	    print ' '.$langs->trans("or").' ';
-	    print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
-	    print ' '.$langs->trans("or").' ';
-	    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+		print '<div class="valignmiddle inline-block" style="padding-right: 20px;">';
+		print '<strong>'.$langs->trans("InputReceiptNumber").'</strong>: ';
+		print '<input class="flat" id="num_releve" name="num_releve" type="text" value="'.(GETPOST('num_releve') ?GETPOST('num_releve') : '').'" size="10">'; // The only default value is value we just entered
+		print '</div>';
+		if (is_array($options) && count($options))
+		{
+			print $langs->trans("EventualyAddCategory").': ';
+			print Form::selectarray('cat', $options, GETPOST('cat'), 1);
+		}
+		print '<br><div style="margin-top: 5px;"><span class="opacitymedium">'.$langs->trans("ThenCheckLinesAndConciliate").'</span> ';
+		print '<input class="button" name="confirm_savestatement" type="submit" value="'.$langs->trans("SaveStatementOnly").'">';
+		print ' '.$langs->trans("or").' ';
+		print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+		print ' '.$langs->trans("or").' ';
+		print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
 		print '</div>';
 
-	    // Show last bank statements
-	    $nbmax = 15; // We accept to show last 15 receipts (so we can have more than one year)
-	    $liste = "";
-	    $sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
-	    $sql .= " WHERE fk_account=".$object->id." AND num_releve IS NOT NULL";
-	    $sql .= $db->order("num_releve", "DESC");
-	    $sql .= $db->plimit($nbmax + 1);
-	    print '<br>';
-	    print $langs->trans("LastAccountStatements").' : ';
-	    $resqlr = $db->query($sql);
-	    if ($resqlr)
-	    {
-	        $numr = $db->num_rows($resqlr);
-	        $i = 0;
-	        $last_ok = 0;
-	        while (($i < $numr) && ($i < $nbmax))
-	        {
-	            $objr = $db->fetch_object($resqlr);
-	            if (!$last_ok) {
-	                $last_releve = $objr->num_releve;
-	                $last_ok = 1;
-	            }
-	            $i++;
-	            $liste = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$id.'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
-	        }
-	        if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
-	        print $liste;
-	        if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
-	    } else {
-	        dol_print_error($db);
-	    }
+		// Show last bank statements
+		$nbmax = 12; // We show last 12 receipts (so we can have more than one year)
+		$liste = "";
+		$sql = "SELECT DISTINCT num_releve FROM ".MAIN_DB_PREFIX."bank";
+		$sql .= " WHERE fk_account=".$object->id." AND num_releve IS NOT NULL";
+		$sql .= $db->order("num_releve", "DESC");
+		$sql .= $db->plimit($nbmax + 1);
+		print '<br>';
+		print $langs->trans("LastAccountStatements").' : ';
+		$resqlr = $db->query($sql);
+		if ($resqlr)
+		{
+			$numr = $db->num_rows($resqlr);
+			$i = 0;
+			$last_ok = 0;
+			while (($i < $numr) && ($i < $nbmax))
+			{
+				$objr = $db->fetch_object($resqlr);
+				if (!$last_ok) {
+					$last_releve = $objr->num_releve;
+					$last_ok = 1;
+				}
+				$i++;
+				$liste = '<a href="'.DOL_URL_ROOT.'/compta/bank/releve.php?account='.$id.'&amp;num='.$objr->num_releve.'">'.$objr->num_releve.'</a> &nbsp; '.$liste;
+			}
+			if ($numr >= $nbmax) $liste = "... &nbsp; ".$liste;
+			print $liste;
+			if ($numr <= 0) print '<b>'.$langs->trans("None").'</b>';
+		} else {
+			dol_print_error($db);
+		}
 
 		// Using BANK_REPORT_LAST_NUM_RELEVE to automatically report last num (or not)
 		if (!empty($conf->global->BANK_REPORT_LAST_NUM_RELEVE))
@@ -775,21 +776,22 @@ if ($resql)
 		{
 			if (empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT))	// If direct entries is done using miscellaneous payments
 			{
-			    $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/bank/various_payment/card.php?action=create&accountid='.$search_account.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.urlencode($search_account)), '', $user->rights->banque->modifier);
 			} else // If direct entries is not done using miscellaneous payments
 			{
-                $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', $user->rights->banque->modifier);
 			}
 		} else {
-            $newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
+			$newcardbutton = dolGetButtonTitle($langs->trans('AddBankRecord'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?action=addline&page='.$page.$param, '', -1);
 		}
 	}
 
-	$morehtml = '<div class="inline-block '.(($buttonreconcile || $newcardbutton) ? 'marginrightonly' : '').'">';
+	/*$morehtml = '<div class="inline-block '.(($buttonreconcile || $newcardbutton) ? 'marginrightonly' : '').'">';
 	$morehtml .= '<label for="pageplusone">'.$langs->trans("Page")."</label> "; // ' Page ';
 	$morehtml .= '<input type="text" name="pageplusone" id="pageplusone" class="flat right width25 pageplusone" value="'.($page + 1).'">';
 	$morehtml .= '/'.$nbtotalofpages.' ';
 	$morehtml .= '</div>';
+	*/
 
 	if ($action != 'addline' && $action != 'reconcile')
 	{
@@ -801,7 +803,7 @@ if ($resql)
 	$picto = 'bank_account';
 	if ($id > 0 || !empty($ref)) $picto = '';
 
-	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit);
+	print_barre_liste($langs->trans("BankTransactions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $morehtml, '', $limit, 0, 0, 1);
 
 	// We can add page now to param
 	if ($page != '') $param .= '&page='.urlencode($page);
@@ -837,7 +839,7 @@ if ($resql)
 			$moreforfilter .= '<div class="divsearchfield">';
 			$moreforfilter .= $langs->trans('RubriquesTransactions').' : ';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_BANK_LINE, $search_bid, 'parent', null, null, 1);
-			$moreforfilter .= $form->selectarray('search_bid', $cate_arbo, $search_bid, 1);
+			$moreforfilter .= $form->selectarray('search_bid', $cate_arbo, $search_bid, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 			$moreforfilter .= '</div>';
 		}
 	}
@@ -854,66 +856,66 @@ if ($resql)
 		print '</div>'."\n";
 	}
 
-    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-    $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 	print '<tr class="liste_titre_filter">';
 	if (!empty($arrayfields['b.rowid']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
-	    print '</td>';
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat" name="search_ref" size="2" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.label']['checked']))
 	{
-	    print '<td class="liste_titre">';
-    	print '<input type="text" class="flat maxwidth100" name="search_description" value="'.dol_escape_htmltag($search_description).'">';
-    	print '</td>';
+		print '<td class="liste_titre">';
+		print '<input type="text" class="flat maxwidth100" name="search_description" value="'.dol_escape_htmltag($search_description).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.dateo']['checked']))
 	{
-        print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['b.datev']['checked']))
 	{
-        print '<td class="liste_titre">&nbsp;</td>';
+		print '<td class="liste_titre">&nbsp;</td>';
 	}
 	if (!empty($arrayfields['type']['checked']))
 	{
-        print '<td class="liste_titre" align="center">';
-        $form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
-        print '</td>';
+		print '<td class="liste_titre" align="center">';
+		$form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.num_chq']['checked']))
 	{
-        // Numero
-        print '<td class="liste_titre" align="center"><input type="text" class="flat" name="req_nb" value="'.dol_escape_htmltag($search_req_nb).'" size="2"></td>';
+		// Numero
+		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="req_nb" value="'.dol_escape_htmltag($search_req_nb).'" size="2"></td>';
 	}
 	if (!empty($arrayfields['bu.label']['checked']))
 	{
-	    print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
+		print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty).'"></td>';
 	}
 	if (!empty($arrayfields['ba.ref']['checked']))
 	{
-    	print '<td class="liste_titre">';
-    	$form->select_comptes($search_account, 'search_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''), 0, 'maxwidth100');
-    	print '</td>';
+		print '<td class="liste_titre">';
+		$form->select_comptes($search_account, 'search_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''), 0, 'maxwidth100');
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.debit']['checked']))
 	{
-    	print '<td class="liste_titre right">';
-    	print '<input type="text" class="flat width50" name="search_debit" value="'.dol_escape_htmltag($search_debit).'">';
-    	print '</td>';
+		print '<td class="liste_titre right">';
+		print '<input type="text" class="flat width50" name="search_debit" value="'.dol_escape_htmltag($search_debit).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['b.credit']['checked']))
 	{
-    	print '<td class="liste_titre right">';
-    	print '<input type="text" class="flat width50" name="search_credit" value="'.dol_escape_htmltag($search_credit).'">';
-    	print '</td>';
+		print '<td class="liste_titre right">';
+		print '<input type="text" class="flat width50" name="search_credit" value="'.dol_escape_htmltag($search_credit).'">';
+		print '</td>';
 	}
 	if (!empty($arrayfields['balancebefore']['checked']))
 	{
@@ -932,21 +934,21 @@ if ($resql)
 	// Numero statement
 	if (!empty($arrayfields['b.num_releve']['checked']))
 	{
-        print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_num_releve" value="'.dol_escape_htmltag($search_num_releve).'" size="3"></td>';
+		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_num_releve" value="'.dol_escape_htmltag($search_num_releve).'" size="3"></td>';
 	}
 	// Conciliated
 	if (!empty($arrayfields['b.conciliated']['checked']))
 	{
-        print '<td class="liste_titre" align="center">';
-        print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1);
-        print '</td>';
+		print '<td class="liste_titre" align="center">';
+		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1);
+		print '</td>';
 	}
 	print '<td class="liste_titre" align="middle">';
 	print '</td>';
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
 	print $searchpicto;
-    print '</td>';
+	print '</td>';
 	print "</tr>\n";
 
 	// Fields title
@@ -984,107 +986,107 @@ if ($resql)
 	// Loop on each record
 	$sign = 1;
 
-    $totalarray = array();
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
+	$totalarray = array();
+	while ($i < min($num, $limit))
+	{
+		$objp = $db->fetch_object($resql);
 
-        // If we are in a situation where we need/can show balance, we calculate the start of balance
-        if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && $mode_balance_ok)
-        {
-            if (!$search_account)
-            {
-                dol_print_error('', 'account is not defined but $mode_balance_ok is true');
-                exit;
-            }
+		// If we are in a situation where we need/can show balance, we calculate the start of balance
+		if (!$balancecalculated && (!empty($arrayfields['balancebefore']['checked']) || !empty($arrayfields['balance']['checked'])) && $mode_balance_ok)
+		{
+			if (!$search_account)
+			{
+				dol_print_error('', 'account is not defined but $mode_balance_ok is true');
+				exit;
+			}
 
-            // Loop on each record before
-            $sign = 1;
-            $i = 0;
-            $sqlforbalance = 'SELECT SUM(b.amount) as previoustotal';
-            $sqlforbalance .= " FROM ";
-            $sqlforbalance .= " ".MAIN_DB_PREFIX."bank_account as ba,";
-            $sqlforbalance .= " ".MAIN_DB_PREFIX."bank as b";
-            $sqlforbalance .= " WHERE b.fk_account = ba.rowid";
-            $sqlforbalance .= " AND ba.entity IN (".getEntity('bank_account').")";
-            $sqlforbalance .= " AND b.fk_account = ".$search_account;
-            $sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
-            $resqlforbalance = $db->query($sqlforbalance);
-            //print $sqlforbalance;
-            if ($resqlforbalance)
-            {
-                $objforbalance = $db->fetch_object($resqlforbalance);
-                if ($objforbalance)
-                {
-                	// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
-                	if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
-                	{
-                		$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
-                	} // If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
-                	else {
-                		$balance = $objforbalance->previoustotal;
-                	}
-                }
-            } else dol_print_error($db);
+			// Loop on each record before
+			$sign = 1;
+			$i = 0;
+			$sqlforbalance = 'SELECT SUM(b.amount) as previoustotal';
+			$sqlforbalance .= " FROM ";
+			$sqlforbalance .= " ".MAIN_DB_PREFIX."bank_account as ba,";
+			$sqlforbalance .= " ".MAIN_DB_PREFIX."bank as b";
+			$sqlforbalance .= " WHERE b.fk_account = ba.rowid";
+			$sqlforbalance .= " AND ba.entity IN (".getEntity('bank_account').")";
+			$sqlforbalance .= " AND b.fk_account = ".$search_account;
+			$sqlforbalance .= " AND (b.datev < '".$db->idate($db->jdate($objp->dv))."' OR (b.datev = '".$db->idate($db->jdate($objp->dv))."' AND (b.dateo < '".$db->idate($db->jdate($objp->do))."' OR (b.dateo = '".$db->idate($db->jdate($objp->do))."' AND b.rowid < ".$objp->rowid."))))";
+			$resqlforbalance = $db->query($sqlforbalance);
+			//print $sqlforbalance;
+			if ($resqlforbalance)
+			{
+				$objforbalance = $db->fetch_object($resqlforbalance);
+				if ($objforbalance)
+				{
+					// If sort is desc,desc,desc then total of previous date + amount is the balancebefore of the previous line before the line to show
+					if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
+					{
+						$balancebefore = $objforbalance->previoustotal + ($sign * $objp->amount);
+					} // If sort is asc,asc,asc then total of previous date is balance of line before the next line to show
+					else {
+						$balance = $objforbalance->previoustotal;
+					}
+				}
+			} else dol_print_error($db);
 
-            $balancecalculated = true;
+			$balancecalculated = true;
 
-            // Output a line with start balance
-            if ($user->rights->banque->consolidate && $action == 'reconcile')
-            {
-            	$tmpnbfieldbeforebalance = 0;
-            	$tmpnbfieldafterbalance = 0;
-            	$balancefieldfound = 0;
-            	foreach ($arrayfields as $key => $val)
-            	{
-            		if ($key == 'balancebefore' || $key == 'balance')
-            		{
-            			$balancefieldfound++;
-            			continue;
-            		}
-           			if (!empty($arrayfields[$key]['checked']))
-           			{
-           				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-           				else $tmpnbfieldafterbalance++;
-           			}
-            	}
-            	// Extra fields
-            	$element = 'banktransaction';
-            	if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label']))
-            	{
-            		foreach ($extrafields->attributes[$element]['label'] as $key => $val)
-            		{
-            			if (!empty($arrayfields["ef.".$key]['checked']))
-            			{
-		           			if (!empty($arrayfields[$key]['checked']))
-		           			{
-		           				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
-		           				else $tmpnbfieldafterbalance++;
-		           			}
-            			}
-            		}
-            	}
+			// Output a line with start balance
+			if ($user->rights->banque->consolidate && $action == 'reconcile')
+			{
+				$tmpnbfieldbeforebalance = 0;
+				$tmpnbfieldafterbalance = 0;
+				$balancefieldfound = 0;
+				foreach ($arrayfields as $key => $val)
+				{
+					if ($key == 'balancebefore' || $key == 'balance')
+					{
+						$balancefieldfound++;
+						continue;
+					}
+		   			if (!empty($arrayfields[$key]['checked']))
+		   			{
+		   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
+		   				else $tmpnbfieldafterbalance++;
+		   			}
+				}
+				// Extra fields
+				$element = 'banktransaction';
+				if (is_array($extrafields->attributes[$element]['label']) && count($extrafields->attributes[$element]['label']))
+				{
+					foreach ($extrafields->attributes[$element]['label'] as $key => $val)
+					{
+						if (!empty($arrayfields["ef.".$key]['checked']))
+						{
+				   			if (!empty($arrayfields[$key]['checked']))
+				   			{
+				   				if (!$balancefieldfound) $tmpnbfieldbeforebalance++;
+				   				else $tmpnbfieldafterbalance++;
+				   			}
+						}
+					}
+				}
 
-            	print '<tr class="oddeven trforbreak">';
-            	if ($tmpnbfieldbeforebalance)
-            	{
-            		print '<td colspan="'.$tmpnbfieldbeforebalance.'">';
-            		print '&nbsp;';
-            		print '</td>';
-            	}
+				print '<tr class="oddeven trforbreak">';
+				if ($tmpnbfieldbeforebalance)
+				{
+					print '<td colspan="'.$tmpnbfieldbeforebalance.'">';
+					print '&nbsp;';
+					print '</td>';
+				}
 
-            	if (!empty($arrayfields['balancebefore']['checked']))
-            	{
-	            	print '<td class="right">';
-	            	print price(price2num($balance, 'MT'), 1, $langs);
-	            	print '</td>';
-            	}
-            	if (!empty($arrayfields['balance']['checked']))
-            	{
-            		print '<td class="right">';
+				if (!empty($arrayfields['balancebefore']['checked']))
+				{
+					print '<td class="right">';
 					print price(price2num($balance, 'MT'), 1, $langs);
 					print '</td>';
-            	}
+				}
+				if (!empty($arrayfields['balance']['checked']))
+				{
+					print '<td class="right">';
+					print price(price2num($balance, 'MT'), 1, $langs);
+					print '</td>';
+				}
 
 				print '<td class="center">';
 				print '<input type="checkbox" id="selectAll" />';
@@ -1097,249 +1099,249 @@ if ($resql)
 				print '<td colspan="'.($tmpnbfieldafterbalance + 2).'">';
 				print '&nbsp;';
 				print '</td>';
-            	print '</tr>';
-            }
-        }
+				print '</tr>';
+			}
+		}
 
 
-        if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
-        {
-        	$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
-        	$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
-        } else {
+		if ($sortfield == 'b.datev,b.dateo,b.rowid' && $sortorder == 'desc,desc,desc')
+		{
+			$balance = price2num($balancebefore, 'MT'); // balance = balancebefore of previous line (sort is desc)
+			$balancebefore = price2num($balancebefore - ($sign * $objp->amount), 'MT');
+		} else {
 			$balancebefore = price2num($balance, 'MT'); // balancebefore = balance of previous line (sort is asc)
 			$balance = price2num($balance + ($sign * $objp->amount), 'MT');
 		}
 
-        if (empty($cachebankaccount[$objp->bankid]))
-        {
-            $bankaccounttmp = new Account($db);
-            $bankaccounttmp->fetch($objp->bankid);
-            $cachebankaccount[$objp->bankid] = $bankaccounttmp;
-            $bankaccount = $bankaccounttmp;
-        } else {
-            $bankaccount = $cachebankaccount[$objp->bankid];
-        }
+		if (empty($cachebankaccount[$objp->bankid]))
+		{
+			$bankaccounttmp = new Account($db);
+			$bankaccounttmp->fetch($objp->bankid);
+			$cachebankaccount[$objp->bankid] = $bankaccounttmp;
+			$bankaccount = $bankaccounttmp;
+		} else {
+			$bankaccount = $cachebankaccount[$objp->bankid];
+		}
 
-        if (empty($conf->global->BANK_COLORIZE_MOVEMENT)) {
-            $backgroundcolor = "class='oddeven'";
-        } else {
-            if ($objp->amount < 0)
-            {
-                if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
-                    $color = '#fca955';
-                } else {
-                    $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
-                }
-                $backgroundcolor = 'style="background: '.$color.';"';
-            } else {
-                if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
-                    $color = '#7fdb86';
-                } else {
-                    $color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
-                }
-                $backgroundcolor = 'style="background: '.$color.';"';
-            }
-        }
+		if (empty($conf->global->BANK_COLORIZE_MOVEMENT)) {
+			$backgroundcolor = "class='oddeven'";
+		} else {
+			if ($objp->amount < 0)
+			{
+				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR1)) {
+					$color = '#fca955';
+				} else {
+					$color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR1;
+				}
+				$backgroundcolor = 'style="background: '.$color.';"';
+			} else {
+				if (empty($conf->global->BANK_COLORIZE_MOVEMENT_COLOR2)) {
+					$color = '#7fdb86';
+				} else {
+					$color = '#'.$conf->global->BANK_COLORIZE_MOVEMENT_COLOR2;
+				}
+				$backgroundcolor = 'style="background: '.$color.';"';
+			}
+		}
 
-        $banklinestatic->id = $objp->rowid;
-        $banklinestatic->ref = $objp->rowid;
+		$banklinestatic->id = $objp->rowid;
+		$banklinestatic->ref = $objp->rowid;
 
-        print '<tr class="oddeven" '.$backgroundcolor.'>';
+		print '<tr class="oddeven" '.$backgroundcolor.'>';
 
-        // Ref
-    	if (!empty($arrayfields['b.rowid']['checked']))
-    	{
-                print '<td class="nowrap left">';
-                print $banklinestatic->getNomUrl(1);
-                print '</td>';
-                if (!$i) $totalarray['nbfield']++;
-    	}
+		// Ref
+		if (!empty($arrayfields['b.rowid']['checked']))
+		{
+				print '<td class="nowrap left">';
+				print $banklinestatic->getNomUrl(1);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Description
-    	if (!empty($arrayfields['b.label']['checked']))
-    	{
-    	    print "<td>";
+		// Description
+		if (!empty($arrayfields['b.label']['checked']))
+		{
+			print "<td>";
 
-    	    //print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
-    	    $reg = array();
-    	    preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
-    	    if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
-    	    else {
-    	    	if ($objp->label == '(payment_salary)') {
-    	    		print dol_trunc($langs->trans("SalaryPayment", 40));
-    	    	} else {
-    	    		print dol_trunc($objp->label, 40);
-    	    	}
-    	    }
-    	    //print "</a>&nbsp;";
+			//print "<a href=\"line.php?rowid=".$objp->rowid."&amp;account=".$objp->fk_account."\">";
+			$reg = array();
+			preg_match('/\((.+)\)/i', $objp->label, $reg); // Si texte entoure de parenthee on tente recherche de traduction
+			if ($reg[1] && $langs->trans($reg[1]) != $reg[1]) print $langs->trans($reg[1]);
+			else {
+				if ($objp->label == '(payment_salary)') {
+					print dol_trunc($langs->trans("SalaryPayment", 40));
+				} else {
+					print dol_trunc($objp->label, 40);
+				}
+			}
+			//print "</a>&nbsp;";
 
-    	    // Add links after description
-    	    $links = $bankaccountstatic->get_url($objp->rowid);
-    	    $cachebankaccount = array();
-    	    foreach ($links as $key=>$val)
-    	    {
-    	    	print '<!-- '.$links[$key]['type'].' -->';
-    	    	if ($links[$key]['type'] == 'withdraw')
-    	    	{
-    	    		$banktransferstatic->id = $links[$key]['url_id'];
-    	    		$banktransferstatic->ref = $links[$key]['label'];
-    	    		print ' '.$banktransferstatic->getNomUrl(0);
-    	    	} elseif ($links[$key]['type'] == 'payment')
-    	        {
-    	            $paymentstatic->id = $links[$key]['url_id'];
-    	            $paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-    	            print ' '.$paymentstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_supplier')
-    	        {
-    	            $paymentsupplierstatic->id = $links[$key]['url_id'];
-    	            $paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
-    	            print ' '.$paymentsupplierstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_sc')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            //print $langs->trans("SocialContributionPayment");
-    	            print '</a>';
-    	        } elseif ($links[$key]['type'] == 'payment_vat')
-    	        {
-    	            $paymentvatstatic->id = $links[$key]['url_id'];
-    	            $paymentvatstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentvatstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_salary')
-    	        {
-    	            $paymentsalstatic->id = $links[$key]['url_id'];
-    	            $paymentsalstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentsalstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_loan')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            print '</a>';
-    	        } elseif ($links[$key]['type'] == 'payment_donation')
-    	        {
-    	            print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
-    	            print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
-    	            print '</a>';
-    	        } elseif ($links[$key]['type'] == 'payment_expensereport')
-    	        {
-    	            $paymentexpensereportstatic->id = $links[$key]['url_id'];
-    	            $paymentexpensereportstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentexpensereportstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'payment_various')
-    	        {
-    	            $paymentvariousstatic->id = $links[$key]['url_id'];
-    	            $paymentvariousstatic->ref = $links[$key]['url_id'];
-    	            print ' '.$paymentvariousstatic->getNomUrl(2);
-    	        } elseif ($links[$key]['type'] == 'banktransfert')
-    	        {
-    	            // Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
-    	            if ($objp->amount > 0)
-    	            {
-    	                $banklinestatic->fetch($links[$key]['url_id']);
-    	                $bankstatic->id = $banklinestatic->fk_account;
-    	                $bankstatic->label = $banklinestatic->bank_account_ref;
-    	                print ' ('.$langs->trans("TransferFrom").' ';
-    	                print $bankstatic->getNomUrl(1, 'transactions');
-    	                print ' '.$langs->trans("toward").' ';
-    	                $bankstatic->id = $objp->bankid;
-    	                $bankstatic->label = $objp->bankref;
-    	                print $bankstatic->getNomUrl(1, '');
-    	                print ')';
-    	            } else {
-    	                $bankstatic->id = $objp->bankid;
-    	                $bankstatic->label = $objp->bankref;
-    	                print ' ('.$langs->trans("TransferFrom").' ';
-    	                print $bankstatic->getNomUrl(1, '');
-    	                print ' '.$langs->trans("toward").' ';
-    	                $banklinestatic->fetch($links[$key]['url_id']);
-    	                $bankstatic->id = $banklinestatic->fk_account;
-    	                $bankstatic->label = $banklinestatic->bank_account_ref;
-    	                print $bankstatic->getNomUrl(1, 'transactions');
-    	                print ')';
-    	            }
-    	            //var_dump($links);
-    	        } elseif ($links[$key]['type'] == 'company')
-    	        {
-    	        } elseif ($links[$key]['type'] == 'user')
-    	        {
-    	        } elseif ($links[$key]['type'] == 'member')
-    	        {
-    	        } elseif ($links[$key]['type'] == 'sc')
-    	        {
-    	        } else {
-    	            // Show link with label $links[$key]['label']
-    	            if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
-    	            print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
-    	            if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg))
-    	            {
-    	                // Label generique car entre parentheses. On l'affiche en le traduisant
-    	                if ($reg[1] == 'paiement') $reg[1] = 'Payment';
-    	                print ' '.$langs->trans($reg[1]);
-    	            } else {
-    	                print ' '.$links[$key]['label'];
-    	            }
-    	            print '</a>';
-    	        }
-    	    }
-    	    print '</td>';
-    	    if (!$i) $totalarray['nbfield']++;
-    	}
+			// Add links after description
+			$links = $bankaccountstatic->get_url($objp->rowid);
+			$cachebankaccount = array();
+			foreach ($links as $key=>$val)
+			{
+				print '<!-- '.$links[$key]['type'].' -->';
+				if ($links[$key]['type'] == 'withdraw')
+				{
+					$banktransferstatic->id = $links[$key]['url_id'];
+					$banktransferstatic->ref = $links[$key]['label'];
+					print ' '.$banktransferstatic->getNomUrl(0);
+				} elseif ($links[$key]['type'] == 'payment')
+				{
+					$paymentstatic->id = $links[$key]['url_id'];
+					$paymentstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
+					print ' '.$paymentstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_supplier')
+				{
+					$paymentsupplierstatic->id = $links[$key]['url_id'];
+					$paymentsupplierstatic->ref = $links[$key]['url_id']; // FIXME This is id, not ref of payment
+					print ' '.$paymentsupplierstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_sc')
+				{
+					print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/card.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
+					//print $langs->trans("SocialContributionPayment");
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_vat')
+				{
+					$paymentvatstatic->id = $links[$key]['url_id'];
+					$paymentvatstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentvatstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_salary')
+				{
+					$paymentsalstatic->id = $links[$key]['url_id'];
+					$paymentsalstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentsalstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_loan')
+				{
+					print '<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_donation')
+				{
+					print '<a href="'.DOL_URL_ROOT.'/don/payment/card.php?id='.$links[$key]['url_id'].'">';
+					print ' '.img_object($langs->trans('ShowPayment'), 'payment').' ';
+					print '</a>';
+				} elseif ($links[$key]['type'] == 'payment_expensereport')
+				{
+					$paymentexpensereportstatic->id = $links[$key]['url_id'];
+					$paymentexpensereportstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentexpensereportstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'payment_various')
+				{
+					$paymentvariousstatic->id = $links[$key]['url_id'];
+					$paymentvariousstatic->ref = $links[$key]['url_id'];
+					print ' '.$paymentvariousstatic->getNomUrl(2);
+				} elseif ($links[$key]['type'] == 'banktransfert')
+				{
+					// Do not show link to transfer since there is no transfer card (avoid confusion). Can already be accessed from transaction detail.
+					if ($objp->amount > 0)
+					{
+						$banklinestatic->fetch($links[$key]['url_id']);
+						$bankstatic->id = $banklinestatic->fk_account;
+						$bankstatic->label = $banklinestatic->bank_account_ref;
+						print ' ('.$langs->trans("TransferFrom").' ';
+						print $bankstatic->getNomUrl(1, 'transactions');
+						print ' '.$langs->trans("toward").' ';
+						$bankstatic->id = $objp->bankid;
+						$bankstatic->label = $objp->bankref;
+						print $bankstatic->getNomUrl(1, '');
+						print ')';
+					} else {
+						$bankstatic->id = $objp->bankid;
+						$bankstatic->label = $objp->bankref;
+						print ' ('.$langs->trans("TransferFrom").' ';
+						print $bankstatic->getNomUrl(1, '');
+						print ' '.$langs->trans("toward").' ';
+						$banklinestatic->fetch($links[$key]['url_id']);
+						$bankstatic->id = $banklinestatic->fk_account;
+						$bankstatic->label = $banklinestatic->bank_account_ref;
+						print $bankstatic->getNomUrl(1, 'transactions');
+						print ')';
+					}
+					//var_dump($links);
+				} elseif ($links[$key]['type'] == 'company')
+				{
+				} elseif ($links[$key]['type'] == 'user')
+				{
+				} elseif ($links[$key]['type'] == 'member')
+				{
+				} elseif ($links[$key]['type'] == 'sc')
+				{
+				} else {
+					// Show link with label $links[$key]['label']
+					if (!empty($objp->label) && !empty($links[$key]['label'])) print ' - ';
+					print '<a href="'.$links[$key]['url'].$links[$key]['url_id'].'">';
+					if (preg_match('/^\((.*)\)$/i', $links[$key]['label'], $reg))
+					{
+						// Label generique car entre parentheses. On l'affiche en le traduisant
+						if ($reg[1] == 'paiement') $reg[1] = 'Payment';
+						print ' '.$langs->trans($reg[1]);
+					} else {
+						print ' '.$links[$key]['label'];
+					}
+					print '</a>';
+				}
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Date ope
-    	if (!empty($arrayfields['b.dateo']['checked']))
-    	{
-    	    print '<td align="center" class="nowrap">';
-    	    print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
-    	    print '&nbsp;';
-    	    print '<span class="inline-block">';
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_remove()."</a> ";
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_add()."</a>";
-    	    print '</span>';
-    	    print "</td>\n";
-                if (!$i) $totalarray['nbfield']++;
-    	}
+		// Date ope
+		if (!empty($arrayfields['b.dateo']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print '<span id="dateoperation_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->do), "day")."</span>";
+			print '&nbsp;';
+			print '<span class="inline-block">';
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=doprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_remove()."</a> ";
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=donext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_add()."</a>";
+			print '</span>';
+			print "</td>\n";
+				if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Date value
-    	if (!empty($arrayfields['b.datev']['checked']))
-    	{
-    	    print '<td align="center" class="nowrap">';
-    	    print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv), "day")."</span>";
-    	    print '&nbsp;';
-    	    print '<span class="inline-block">';
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_remove()."</a> ";
-    	    print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
-    	    print img_edit_add()."</a>";
-    	    print '</span>';
-    	    print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+		// Date value
+		if (!empty($arrayfields['b.datev']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			print '<span id="datevalue_'.$objp->rowid.'">'.dol_print_date($db->jdate($objp->dv), "day")."</span>";
+			print '&nbsp;';
+			print '<span class="inline-block">';
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvprev&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_remove()."</a> ";
+			print '<a class="ajax" href="'.$_SERVER['PHP_SELF'].'?action=dvnext&amp;account='.$objp->bankid.'&amp;rowid='.$objp->rowid.'">';
+			print img_edit_add()."</a>";
+			print '</span>';
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Payment type
-    	if (!empty($arrayfields['type']['checked']))
-    	{
-        	print '<td align="center" class="nowrap">';
-	        $labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
-	        if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
-	        else print $labeltype;
-	        print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+		// Payment type
+		if (!empty($arrayfields['type']['checked']))
+		{
+			print '<td align="center" class="nowrap">';
+			$labeltype = ($langs->trans("PaymentTypeShort".$objp->fk_type) != "PaymentTypeShort".$objp->fk_type) ? $langs->trans("PaymentTypeShort".$objp->fk_type) : $langs->getLabelFromKey($db, $objp->fk_type, 'c_paiement', 'code', 'libelle', '', 1);
+			if ($labeltype == 'SOLD') print '&nbsp;'; //$langs->trans("InitialBankBalance");
+			else print $labeltype;
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        // Num cheque
-    	if (!empty($arrayfields['b.num_chq']['checked']))
-    	{
-    	    print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	}
+		// Num cheque
+		if (!empty($arrayfields['b.num_chq']['checked']))
+		{
+			print '<td class="nowrap" align="center">'.($objp->num_chq ? $objp->num_chq : "")."</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+		}
 
 		// Third party
-    	if (!empty($arrayfields['bu.label']['checked']))
-    	{
-        	print '<td class="tdoverflowmax150">';
+		if (!empty($arrayfields['bu.label']['checked']))
+		{
+			print '<td class="tdoverflowmax150">';
 			if ($objp->url_id)
 			{
 				$companystatic->id = $objp->url_id;
@@ -1357,157 +1359,157 @@ if ($resql)
 				print '&nbsp;';
 			}
 			print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-    	}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Bank account
-    	if (!empty($arrayfields['ba.ref']['checked']))
-    	{
-        	print '<td class="nowrap">';
+		// Bank account
+		if (!empty($arrayfields['ba.ref']['checked']))
+		{
+			print '<td class="nowrap">';
 			print $bankaccount->getNomUrl(1);
 			print "</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-    	}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Debit
-    	if (!empty($arrayfields['b.debit']['checked']))
-    	{
-    	    print '<td class="nowrap right">';
-    	    if ($objp->amount < 0)
-    	    {
-    	    	print price($objp->amount * -1);
-    	        $totalarray['totaldeb'] += $objp->amount;
-    	    }
-    	    print "</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	    if (!$i) $totalarray['totaldebfield'] = $totalarray['nbfield'];
-    	}
+		// Debit
+		if (!empty($arrayfields['b.debit']['checked']))
+		{
+			print '<td class="nowrap right">';
+			if ($objp->amount < 0)
+			{
+				print price($objp->amount * -1);
+				$totalarray['totaldeb'] += $objp->amount;
+			}
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totaldebfield'] = $totalarray['nbfield'];
+		}
 
-    	// Credit
-    	if (!empty($arrayfields['b.credit']['checked']))
-    	{
-    	    print '<td class="nowrap right">';
-    	    if ($objp->amount > 0)
-    	    {
+		// Credit
+		if (!empty($arrayfields['b.credit']['checked']))
+		{
+			print '<td class="nowrap right">';
+			if ($objp->amount > 0)
+			{
 				print price($objp->amount);
-    	        $totalarray['totalcred'] += $objp->amount;
-    	    }
-    	    print "</td>\n";
-    	    if (!$i) $totalarray['nbfield']++;
-    	    if (!$i) $totalarray['totalcredfield'] = $totalarray['nbfield'];
-    	}
+				$totalarray['totalcred'] += $objp->amount;
+			}
+			print "</td>\n";
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['totalcredfield'] = $totalarray['nbfield'];
+		}
 
-    	// Balance before
-    	if (!empty($arrayfields['balancebefore']['checked']))
-    	{
-    		if ($mode_balance_ok)
-    		{
-    			if ($balancebefore >= 0)
-    			{
-    				print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
-    			} else {
-    				print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
-    			}
-    		} else {
-    			print '<td class="right">-</td>';
-    		}
-    		if (!$i) $totalarray['nbfield']++;
-    	}
-    	// Balance
-    	if (!empty($arrayfields['balance']['checked']))
-    	{
-    		if ($mode_balance_ok)
-    		{
-    			if ($balance >= 0)
-    			{
-    				print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
-    			} else {
-    				print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
-    			}
-    		} else {
-    			print '<td class="right">-</td>';
-    		}
-    		if (!$i) $totalarray['nbfield']++;
-    	}
+		// Balance before
+		if (!empty($arrayfields['balancebefore']['checked']))
+		{
+			if ($mode_balance_ok)
+			{
+				if ($balancebefore >= 0)
+				{
+					print '<td class="nowrap right">&nbsp;'.price($balancebefore).'</td>';
+				} else {
+					print '<td class="error nowrap right">&nbsp;'.price($balancebefore).'</td>';
+				}
+			} else {
+				print '<td class="right">-</td>';
+			}
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Balance
+		if (!empty($arrayfields['balance']['checked']))
+		{
+			if ($mode_balance_ok)
+			{
+				if ($balance >= 0)
+				{
+					print '<td class="nowrap right">&nbsp;'.price($balance).'</td>';
+				} else {
+					print '<td class="error nowrap right">&nbsp;'.price($balance).'</td>';
+				}
+			} else {
+				print '<td class="right">-</td>';
+			}
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	if (!empty($arrayfields['b.num_releve']['checked']))
-    	{
-            print '<td class="nowraponall" align="center">';
-        	// Transaction reconciliated or edit link
-        	if ($bankaccount->canBeConciliated() > 0)
-        	{
-        		if ($objp->num_releve)
-            	{
-            	    print '<a href="releve.php?num='.$objp->num_releve.'&account='.$objp->bankid.'&save_lastsearch_values=1">'.$objp->num_releve.'</a>';
-            	}
-            	if (!$objp->conciliated && $action == 'reconcile')
-            	{
-            		if ($objp->num_releve) print '&nbsp;';
-            	    print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(!empty($_POST['rowid'][$objp->rowid]) ? ' checked' : '').'>';
-            	}
-        	}
-        	print '</td>';
-            if (!$i)
-            {
-            	$totalarray['nbfield']++;
-            	$posconciliatecol = $totalarray['nbfield'];
-            }
-    	}
+		if (!empty($arrayfields['b.num_releve']['checked']))
+		{
+			print '<td class="nowraponall" align="center">';
+			// Transaction reconciliated or edit link
+			if ($bankaccount->canBeConciliated() > 0)
+			{
+				if ($objp->num_releve)
+				{
+					print '<a href="releve.php?num='.$objp->num_releve.'&account='.$objp->bankid.'&save_lastsearch_values=1">'.$objp->num_releve.'</a>';
+				}
+				if (!$objp->conciliated && $action == 'reconcile')
+				{
+					if ($objp->num_releve) print '&nbsp;';
+					print '<input class="flat" name="rowid['.$objp->rowid.']" type="checkbox" value="'.$objp->rowid.'" size="1"'.(!empty($_POST['rowid'][$objp->rowid]) ? ' checked' : '').'>';
+				}
+			}
+			print '</td>';
+			if (!$i)
+			{
+				$totalarray['nbfield']++;
+				$posconciliatecol = $totalarray['nbfield'];
+			}
+		}
 
-        if (!empty($arrayfields['b.conciliated']['checked']))
-    	{
-            print '<td class="nowraponall" align="center">';
-            print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
-        	print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-    	}
+		if (!empty($arrayfields['b.conciliated']['checked']))
+		{
+			print '<td class="nowraponall" align="center">';
+			print $objp->conciliated ? $langs->trans("Yes") : $langs->trans("No");
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-    	// Action edit/delete
-    	print '<td class="nowraponall" align="center">';
-    	// Transaction reconciliated or edit link
-    	if ($objp->conciliated && $bankaccount->canBeConciliated() > 0)  // If line not conciliated and account can be conciliated
-    	{
-    	    print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	    print img_edit();
-    	    print '</a>';
-    	} else {
-    	    if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
-    	    {
-    	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_edit();
-    	        print '</a>';
-    	    } else {
-    	        print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_view();
-    	        print '</a>';
-    	    }
-    	    if ($bankaccount->canBeConciliated() > 0 && empty($objp->conciliated))
-    	    {
-    	        if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay))
-    	        {
-    	            print ' '.img_warning($langs->trans("ReconciliationLate"));
-    	        }
-    	    }
-    	    if ($user->rights->banque->modifier)
-    	    {
-    	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;rowid='.$objp->rowid.'&amp;id='.$objp->bankid.'&amp;page='.$page.'">';
-    	        print img_delete('', 'class="marginleftonly"');
-    	        print '</a>';
-    	    }
-    	}
-    	print '</td>';
-    	if (!$i) $totalarray['nbfield']++;
+		// Action edit/delete
+		print '<td class="nowraponall" align="center">';
+		// Transaction reconciliated or edit link
+		if ($objp->conciliated && $bankaccount->canBeConciliated() > 0)  // If line not conciliated and account can be conciliated
+		{
+			print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+			print img_edit();
+			print '</a>';
+		} else {
+			if ($user->rights->banque->modifier || $user->rights->banque->consolidate)
+			{
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_edit();
+				print '</a>';
+			} else {
+				print '<a class="editfielda" href="'.DOL_URL_ROOT.'/compta/bank/line.php?save_lastsearch_values=1&amp;rowid='.$objp->rowid.'&amp;account='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_view();
+				print '</a>';
+			}
+			if ($bankaccount->canBeConciliated() > 0 && empty($objp->conciliated))
+			{
+				if ($db->jdate($objp->dv) < ($now - $conf->bank->rappro->warning_delay))
+				{
+					print ' '.img_warning($langs->trans("ReconciliationLate"));
+				}
+			}
+			if ($user->rights->banque->modifier)
+			{
+				print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;rowid='.$objp->rowid.'&amp;id='.$objp->bankid.'&amp;page='.$page.'">';
+				print img_delete('', 'class="marginleftonly"');
+				print '</a>';
+			}
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-    	// Action column
-    	print '<td class="nowrap" align="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 (!$i) $totalarray['nbfield']++;
+		// Action column
+		print '<td class="nowrap" align="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 (!$i) $totalarray['nbfield']++;
 
 		print "</tr>";
 
@@ -1517,25 +1519,25 @@ if ($resql)
 	// Show total line
 	if (isset($totalarray['totaldebfield']) || isset($totalarray['totalcredfield']))
 	{
-	    print '<tr class="liste_total">';
-	    $i = 0;
-	    while ($i < $totalarray['nbfield'])
-	    {
-	        $i++;
-	        if ($i == 1)
-	        {
-	            if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
-	            else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
-	        } elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
-	        elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
-	        elseif ($i == $posconciliatecol)
-	        {
-	        	print '<td class="center">';
-	        	if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
-	        	print '</td>';
-	        } else print '<td></td>';
-	    }
-	    print '</tr>';
+		print '<tr class="liste_total">';
+		$i = 0;
+		while ($i < $totalarray['nbfield'])
+		{
+			$i++;
+			if ($i == 1)
+			{
+				if ($num < $limit && empty($offset)) print '<td class="left">'.$langs->trans("Total").'</td>';
+				else print '<td class="left tdoverflowmax50" title="'.$langs->trans("Totalforthispage").'">'.$langs->trans("Totalforthispage").'</td>';
+			} elseif ($totalarray['totaldebfield'] == $i) print '<td class="right">'.price(-1 * $totalarray['totaldeb']).'</td>';
+			elseif ($totalarray['totalcredfield'] == $i) print '<td class="right">'.price($totalarray['totalcred']).'</td>';
+			elseif ($i == $posconciliatecol)
+			{
+				print '<td class="center">';
+				if ($user->rights->banque->consolidate && $action == 'reconcile') print '<input class="button" name="confirm_reconcile" type="submit" value="'.$langs->trans("Conciliate").'">';
+				print '</td>';
+			} else print '<td></td>';
+		}
+		print '</tr>';
 	}
 
 	// If no record found
@@ -1549,7 +1551,7 @@ if ($resql)
 	print "</table>";
 	print "</div>";
 
-    print '</form>';
+	print '</form>';
 	$db->free($resql);
 } else {
 	dol_print_error($db);
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 18b75bdea9b..fd286266a21 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -43,9 +43,12 @@ $bankcateg = new BankCateg($db);
 $categid = GETPOST('categid');
 $label = GETPOST("label");
 
+
+
 /*
- * Add category
+ * Actions
  */
+
 if (GETPOST('add'))
 {
 	if ($label) {
@@ -95,14 +98,17 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Ref").'</td><td colspan="2">'.$langs->trans("Label").'</td>';
+print '<td>'.$langs->trans("Ref").'</td><td>'.$langs->trans("Label").'</td>';
+print '<td></td>';
+print '<td></td>';
 print "</tr>\n";
 
 // Line to add category
 if ($action != 'edit')
 {
 	print '<tr class="oddeven">';
-	print '<td>&nbsp;</td><td><input name="label" type="text" size="45"></td>';
+	print '<td>&nbsp;</td><td><input name="label" type="text" class="maxwidth100"></td>';
+	print '<td></td>';
 	print '<td class="center"><input type="submit" name="add" class="button" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
 }
@@ -111,7 +117,7 @@ if ($action != 'edit')
 $sql = "SELECT rowid, label";
 $sql .= " FROM ".MAIN_DB_PREFIX."bank_categ";
 $sql .= " WHERE entity = ".$conf->entity;
-$sql .= " ORDER BY label";
+$sql .= " ORDER BY rowid";
 
 $result = $db->query($sql);
 if ($result)
@@ -124,16 +130,19 @@ if ($result)
 		$objp = $db->fetch_object($result);
 
 		print '<tr class="oddeven">';
-		print '<td><a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$objp->rowid.'</a></td>';
+		print '<td>'.$objp->rowid.'</td>';
 		if (GETPOST('action', 'aZ09') == 'edit' && GETPOST("categid") == $objp->rowid)
 		{
-			print "<td colspan=2>";
+			print '<td colspan="3">';
 			print '<input type="hidden" name="categid" value="'.$objp->rowid.'">';
 			print '<input name="label" type="text" size=45 value="'.$objp->label.'">';
 			print '<input type="submit" name="update" class="button" value="'.$langs->trans("Edit").'">';
 			print "</td>";
 		} else {
-			print "<td >".$objp->label."</td>";
+			print "<td>".$objp->label."</td>";
+			print '<td>';
+			//print '<a href="'.DOL_URL_ROOT.'/compta/bank/budget.php?bid='.$objp->rowid.'">'.$langs->trans("List").'</a>';
+			print '</td>';
 			print '<td class="center">';
 			print '<a class="editfielda reposition marginleftonly marginrightonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=edit&amp;token='.newToken().'">'.img_edit().'</a>';
 			print '<a class="marginleftonly" href="'.$_SERVER["PHP_SELF"].'?categid='.$objp->rowid.'&amp;action=delete&amp;token='.newToken().'">'.img_delete().'</a>';
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index 14466915d76..157a7096eb8 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -338,6 +338,24 @@ class PaymentVarious extends CommonObject
 		$this->fk_user_modif = '';
 	}
 
+	/**
+	 * Check if a miscellaneous payment can be created into database
+	 *
+	 * @return	boolean		True or false
+	 */
+	public function check()
+	{
+		$newamount = price2num($this->amount, 'MT');
+
+		// Validation of parameters
+		if (!($newamount) > 0 || empty($this->datep))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 *  Create in database
 	 *
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 5cdd4711871..4e3653d2ea4 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -217,24 +217,21 @@ if ($resql)
 
 
 $help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:M&oacute;dulo_Bancos_y_Cajas';
+
 llxHeader('', $title, $help_url);
 
-$link = '';
-
-
-$num_rows = count($accounts);
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-if ($search_ref != '')      $param .= '&search_ref='.$search_ref;
-if ($search_label != '')    $param .= '&search_label='.$search_label;
-if ($search_number != '')   $param .= '&search_number='.$search_number;
-if ($search_status != '')   $param .= '&search_status='.$search_status;
-if ($show_files)            $param .= '&show_files='.$show_files;
-if ($optioncss != '')       $param .= '&optioncss='.$optioncss;
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_ref != '')      $param .= '&search_ref='.urlencode($search_ref);
+if ($search_label != '')    $param .= '&search_label='.urlencode($search_label);
+if ($search_number != '')   $param .= '&search_number='.urlencode($search_number);
+if ($search_status != '')   $param .= '&search_status='.urlencode($search_status);
+if ($show_files)            $param .= '&show_files='.urlencode($show_files);
+if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -276,7 +273,7 @@ if ($sall)
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	$moreforfilter .= $form->getFilterBox(Categorie::TYPE_ACCOUNT, $search_category_list);
 }
@@ -380,7 +377,7 @@ if (!empty($arrayfields['b.clos']['checked']))
         'opened'=>$langs->trans("Opened"),
         'closed'=>$langs->trans("Closed")
     );
-    print $form->selectarray("search_status", $array, $search_status, 1);
+    print $form->selectarray("search_status", $array, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
     print '</td>';
 }
 // Balance
@@ -419,7 +416,7 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $
 print "</tr>\n";
 
 
-$total = array(); $found = 0; $i = 0; $lastcurrencycode = '';
+$totalarray = array(); $found = 0; $i = 0; $lastcurrencycode = '';
 
 foreach ($accounts as $key=>$type)
 {
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 371dbaa65e2..56843c9032f 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -41,8 +41,9 @@ $langs->loadLangs(array("compta", "banks", "bills", "users", "accountancy", "cat
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$action		= GETPOST('action', 'alpha');
-$cancel		= GETPOST('cancel', 'aZ09');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm');
+$cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
 $accountid = GETPOST("accountid") > 0 ? GETPOST("accountid", "int") : 0;
@@ -225,6 +226,64 @@ if (empty($reshook))
 	}
 }
 
+// Action clone object
+if ($action == 'confirm_clone' && $confirm != 'yes') { $action = ''; }
+
+if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->modifier))
+{
+	$db->begin();
+
+	$originalId = $id;
+
+	$object->fetch($id);
+
+	if ($object->id > 0)
+	{
+		$object->id = $object->ref = null;
+
+		if (GETPOST('clone_label', 'alphanohtml')) {
+			$object->label = GETPOST('clone_label', 'alphanohtml');
+		} else {
+			$object->label = $langs->trans("CopyOf").' '.$object->label;
+		}
+
+		$newdatepayment = dol_mktime(0, 0, 0, GETPOST('clone_date_paymentmonth', 'int'), GETPOST('clone_date_paymentday', 'int'), GETPOST('clone_date_paymentyear', 'int'));
+		$newdatevalue = dol_mktime(0, 0, 0, GETPOST('clone_date_valuemonth', 'int'), GETPOST('clone_date_valueday', 'int'), GETPOST('clone_date_valueyear', 'int'));
+		if ($newdatepayment) $object->datep = $newdatepayment;
+		if (!empty($newdatevalue)) {
+			$object->datev = $newdatevalue;
+		} else {
+			$object->datev = $newdatepayment;
+		}
+
+		if ($object->check())
+		{
+			$id = $object->create($user);
+			if ($id > 0)
+			{
+				$db->commit();
+				$db->close();
+
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
+				$id = $originalId;
+				$db->rollback();
+
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		} else {
+			$id = $originalId;
+			$db->rollback();
+
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		$db->rollback();
+		dol_print_error($db, $object->error);
+	}
+}
+
 
 /*
  *	View
@@ -419,6 +478,19 @@ if ($id)
 
 	$head = various_payment_prepare_head($object);
 
+	// Clone confirmation
+	if ($action === 'clone')
+	{
+		$formquestion = array(
+			array('type' => 'text', 'name' => 'clone_label', 'label' => $langs->trans("Label"), 'value' => $langs->trans("CopyOf").' '.$object->label),
+		);
+		$formquestion[] = array('type' => 'date', 'tdclass'=>'fieldrequired', 'name' => 'clone_date_payment', 'label' => $langs->trans("DatePayment"), 'value' => -1);
+		$formquestion[] = array('type' => 'date', 'name' => 'clone_date_value', 'label' => $langs->trans("DateValue"), 'value' => -1);
+		$formquestion[] = array('type' => 'other', 'tdclass'=>'fieldrequired', 'name' => 'accountid', 'label' => $langs->trans("BankAccount"), 'value' => $form->select_comptes($accountid, "accountid", 0, '', 1));
+
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 300);
+	}
+
 	dol_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
 
 	$morehtmlref = '<div class="refidno">';
@@ -542,6 +614,12 @@ if ($id)
 	// TODO
 	// Add button modify
 
+	// Clone
+	if ($user->rights->banque->modifier)
+	{
+		print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath("/compta/bank/various_payment/card.php", 1).'?id='.$object->id.'&amp;action=clone">'.$langs->trans("ToClone")."</a></div>";
+	}
+
 	// Delete
 	if (empty($object->rappro))
 	{
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 54216f06358..2fb2c56fc46 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -490,9 +490,9 @@ if ($result)
 				print $accountstatic->getNomUrl(1);
 			} else {
 				print '&nbsp;';
-				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
 			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
 		}
 
 		// Bank entry
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 2adf3a01a83..b41e46aff76 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -390,7 +390,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		else print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 5b8b98135a1..fcd7c542eb2 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php'
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 if (!empty($conf->projet->enabled))
 {
-    require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
@@ -62,138 +62,138 @@ include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include,
 
 if ($action == 'validate' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    if ($object->statut == Deplacement::STATUS_DRAFT)
-    {
-        $result = $object->setStatut(1);
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        } else {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+	$object->fetch($id);
+	if ($object->statut == Deplacement::STATUS_DRAFT)
+	{
+		$result = $object->setStatut(1);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 } elseif ($action == 'classifyrefunded' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    if ($object->statut == Deplacement::STATUS_VALIDATED)
-    {
-        $result = $object->setStatut(Deplacement::STATUS_REFUNDED);
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        } else {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    }
+	$object->fetch($id);
+	if ($object->statut == Deplacement::STATUS_VALIDATED)
+	{
+		$result = $object->setStatut(Deplacement::STATUS_REFUNDED);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 } elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer)
 {
-    $result = $object->delete($id);
-    if ($result >= 0)
-    {
-        header("Location: index.php");
-        exit;
-    } else {
-	    setEventMessages($object->error, $object->errors, 'errors');
-    }
+	$result = $object->delete($id);
+	if ($result >= 0)
+	{
+		header("Location: index.php");
+		exit;
+	} else {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
 } elseif ($action == 'add' && $user->rights->deplacement->creer)
 {
-    if (!GETPOST('cancel', 'alpha'))
-    {
-        $error = 0;
+	if (!GETPOST('cancel', 'alpha'))
+	{
+		$error = 0;
 
-        $object->date = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-        $object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
-        $object->type = GETPOST('type', 'alpha');
-        $object->socid = (int) GETPOST('socid', 'int');
-        $object->fk_user = (int) GETPOST('fk_user', 'int');
-        $object->note_private = GETPOST('note_private', 'alpha');
-        $object->note_public = GETPOST('note_public', 'alpha');
-        $object->statut = Deplacement::STATUS_DRAFT;
+		$object->date = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
+		$object->type = GETPOST('type', 'alpha');
+		$object->socid = (int) GETPOST('socid', 'int');
+		$object->fk_user = (int) GETPOST('fk_user', 'int');
+		$object->note_private = GETPOST('note_private', 'alpha');
+		$object->note_public = GETPOST('note_public', 'alpha');
+		$object->statut = Deplacement::STATUS_DRAFT;
 
-        if (!$object->date)
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
-            $error++;
-        }
-        if ($object->type == '-1')
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
-            $error++;
-        }
-        if (!($object->fk_user > 0))
-        {
-	        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Person")), null, 'errors');
-            $error++;
-        }
+		if (!$object->date)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+			$error++;
+		}
+		if ($object->type == '-1')
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+			$error++;
+		}
+		if (!($object->fk_user > 0))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Person")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $id = $object->create($user);
+		if (!$error)
+		{
+			$id = $object->create($user);
 
-            if ($id > 0)
-            {
-                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-                exit;
-            } else {
-	            setEventMessages($object->error, $object->errors, 'errors');
-                $action = 'create';
-            }
-        } else {
-            $action = 'create';
-        }
-    } else {
-        header("Location: index.php");
-        exit;
-    }
+			if ($id > 0)
+			{
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+				exit;
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = 'create';
+			}
+		} else {
+			$action = 'create';
+		}
+	} else {
+		header("Location: index.php");
+		exit;
+	}
 } // Update record
 elseif ($action == 'update' && $user->rights->deplacement->creer)
 {
-    if (!GETPOST('cancel', 'alpha'))
-    {
-        $result = $object->fetch($id);
+	if (!GETPOST('cancel', 'alpha'))
+	{
+		$result = $object->fetch($id);
 
-        $object->date			= dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-        $object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
-        $object->type			= GETPOST('type', 'alpha');
-        $object->socid = (int) GETPOST('socid', 'int');
-        $object->fk_user = (int) GETPOST('fk_user', 'int');
-        $object->note_private = GETPOST('note_private', 'alpha');
-        $object->note_public = GETPOST('note_public', 'alpha');
+		$object->date			= dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$object->km = price2num(GETPOST('km', 'alpha'), 'MU'); // Not 'int', it may be a formated amount
+		$object->type			= GETPOST('type', 'alpha');
+		$object->socid = (int) GETPOST('socid', 'int');
+		$object->fk_user = (int) GETPOST('fk_user', 'int');
+		$object->note_private = GETPOST('note_private', 'alpha');
+		$object->note_public = GETPOST('note_public', 'alpha');
 
-        $result = $object->update($user);
+		$result = $object->update($user);
 
-        if ($result > 0)
-        {
-            header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-            exit;
-        } else {
-	        setEventMessages($object->error, $object->errors, 'errors');
-        }
-    } else {
-        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
-        exit;
-    }
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} else {
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+		exit;
+	}
 } // Set into a project
 elseif ($action == 'classin' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    $result = $object->setProject(GETPOST('projectid', 'int'));
-    if ($result < 0) dol_print_error($db, $object->error);
+	$object->fetch($id);
+	$result = $object->setProject(GETPOST('projectid', 'int'));
+	if ($result < 0) dol_print_error($db, $object->error);
 } // Set fields
 elseif ($action == 'setdated' && $user->rights->deplacement->creer)
 {
-    $dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
-    $object->fetch($id);
-    $result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
-    if ($result < 0) dol_print_error($db, $object->error);
+	$dated = dol_mktime(GETPOST('datedhour', 'int'), GETPOST('datedmin', 'int'), GETPOST('datedsec', 'int'), GETPOST('datedmonth', 'int'), GETPOST('datedday', 'int'), GETPOST('datedyear', 'int'));
+	$object->fetch($id);
+	$result = $object->setValueFrom('dated', $dated, '', '', 'date', '', $user, 'DEPLACEMENT_MODIFY');
+	if ($result < 0) dol_print_error($db, $object->error);
 } elseif ($action == 'setkm' && $user->rights->deplacement->creer)
 {
-    $object->fetch($id);
-    $result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
-    if ($result < 0) dol_print_error($db, $object->error);
+	$object->fetch($id);
+	$result = $object->setValueFrom('km', GETPOST('km', 'int'), '', null, 'text', '', $user, 'DEPLACEMENT_MODIFY');
+	if ($result < 0) dol_print_error($db, $object->error);
 }
 
 
@@ -210,327 +210,327 @@ $form = new Form($db);
 */
 if ($action == 'create')
 {
-    //WYSIWYG Editor
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	//WYSIWYG Editor
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-    print load_fiche_titre($langs->trans("NewTrip"));
+	print load_fiche_titre($langs->trans("NewTrip"));
 
-    $datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+	$datec = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
-    print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    print '<table class="border centpercent">';
+	print '<table class="border centpercent">';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-    $form->select_type_fees(GETPOST('type', 'int'), 'type', 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+	$form->select_type_fees(GETPOST('type', 'int'), 'type', 1);
+	print '</td></tr>';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-    print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
+	print $form->select_dolusers(GETPOST('fk_user', 'int'), 'fk_user', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+	print '</td></tr>';
 
-    print "<tr>";
-    print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-    print $form->selectDate($datec ? $datec : -1, '', '', '', '', 'add', 1, 1);
-    print '</td></tr>';
+	print "<tr>";
+	print '<td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+	print $form->selectDate($datec ? $datec : -1, '', '', '', '', 'add', 1, 1);
+	print '</td></tr>';
 
-    // Km
-    print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value="'.GETPOST("km").'"></td></tr>';
+	// Km
+	print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td><input name="km" size="10" value="'.GETPOST("km").'"></td></tr>';
 
-    // Company
-    print "<tr>";
-    print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-    print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 1);
-    print '</td></tr>';
+	// Company
+	print "<tr>";
+	print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+	print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 1);
+	print '</td></tr>';
 
-    // Public note
-    print '<tr>';
-    print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-    print '<td>';
+	// Public note
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+	print '<td>';
 
-    $doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-    print $doleditor->Create(1);
+	$doleditor = new DolEditor('note_public', GETPOST('note_public', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+	print $doleditor->Create(1);
 
-    print '</td></tr>';
+	print '</td></tr>';
 
-    // Private note
-    if (empty($user->socid))
-    {
-        print '<tr>';
-        print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        print '<td>';
+	// Private note
+	if (empty($user->socid))
+	{
+		print '<tr>';
+		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
+		print '<td>';
 
-        $doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-        print $doleditor->Create(1);
+		$doleditor = new DolEditor('note_private', GETPOST('note_private', 'restricthtml'), '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+		print $doleditor->Create(1);
 
-        print '</td></tr>';
-    }
+		print '</td></tr>';
+	}
 
-    // Other attributes
-    $parameters = array();
-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>';
+	print '</table>';
 
-    print '<br><div class="center">';
+	print '<br><div class="center">';
 	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 	print '</div>';
 
-    print '</form>';
+	print '</form>';
 } elseif ($id)
 {
-    $result = $object->fetch($id);
-    if ($result > 0)
-    {
-        $head = trip_prepare_head($object);
+	$result = $object->fetch($id);
+	if ($result > 0)
+	{
+		$head = trip_prepare_head($object);
 
-        dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
+		dol_fiche_head($head, 'card', $langs->trans("TripCard"), 0, 'trip');
 
-        if ($action == 'edit' && $user->rights->deplacement->creer)
-        {
-            //WYSIWYG Editor
-            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		if ($action == 'edit' && $user->rights->deplacement->creer)
+		{
+			//WYSIWYG Editor
+			require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-            $soc = new Societe($db);
-            if ($object->socid)
-            {
-                $soc->fetch($object->socid);
-            }
+			$soc = new Societe($db);
+			if ($object->socid)
+			{
+				$soc->fetch($object->socid);
+			}
 
-            print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="update">';
-            print '<input type="hidden" name="id" value="'.$id.'">';
+			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="update">';
+			print '<input type="hidden" name="id" value="'.$id.'">';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Ref
-            print "<tr>";
-            print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
-            print $object->ref;
-            print '</td></tr>';
+			// Ref
+			print "<tr>";
+			print '<td class="titlefield">'.$langs->trans("Ref").'</td><td>';
+			print $object->ref;
+			print '</td></tr>';
 
-            // Type
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-            $form->select_type_fees(GETPOST('type', 'int') ?GETPOST('type', 'int') : $object->type, 'type', 0);
-            print '</td></tr>';
+			// Type
+			print "<tr>";
+			print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+			$form->select_type_fees(GETPOST('type', 'int') ?GETPOST('type', 'int') : $object->type, 'type', 0);
+			print '</td></tr>';
 
-            // Who
-            print "<tr>";
-            print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
-            print $form->select_dolusers(GETPOST('fk_user', 'int') ?GETPOST('fk_user', 'int') : $object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
-            print '</td></tr>';
+			// Who
+			print "<tr>";
+			print '<td class="fieldrequired">'.$langs->trans("Person").'</td><td>';
+			print $form->select_dolusers(GETPOST('fk_user', 'int') ?GETPOST('fk_user', 'int') : $object->fk_user, 'fk_user', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+			print '</td></tr>';
 
-            // Date
-            print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
-            print $form->selectDate($object->date, '', 0, 0, 0, 'update', 1, 0);
-            print '</td></tr>';
+			// Date
+			print '<tr><td class="fieldrequired">'.$langs->trans("Date").'</td><td>';
+			print $form->selectDate($object->date, '', 0, 0, 0, 'update', 1, 0);
+			print '</td></tr>';
 
-            // Km
-            print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
-            print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
-            print '</td></tr>';
+			// Km
+			print '<tr><td class="fieldrequired">'.$langs->trans("FeesKilometersOrAmout").'</td><td>';
+			print '<input name="km" class="flat" size="10" value="'.$object->km.'">';
+			print '</td></tr>';
 
-            // Where
-            print "<tr>";
-            print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
-            print $form->select_company($soc->id, 'socid', '', 1);
-            print '</td></tr>';
+			// Where
+			print "<tr>";
+			print '<td>'.$langs->trans("CompanyVisited").'</td><td>';
+			print $form->select_company($soc->id, 'socid', '', 1);
+			print '</td></tr>';
 
-            // Public note
-            print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
-            print '<td>';
+			// Public note
+			print '<tr><td class="tdtop">'.$langs->trans("NotePublic").'</td>';
+			print '<td>';
 
-            $doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-            print $doleditor->Create(1);
+			$doleditor = new DolEditor('note_public', $object->note_public, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+			print $doleditor->Create(1);
 
-            print "</td></tr>";
+			print "</td></tr>";
 
-            // Private note
-            if (empty($user->socid))
-            {
-                print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
-                print '<td>';
+			// Private note
+			if (empty($user->socid))
+			{
+				print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
+				print '<td>';
 
-                $doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
-                print $doleditor->Create(1);
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 200, 'dolibarr_notes', 'In', false, true, true, ROWS_8, '90%');
+				print $doleditor->Create(1);
 
-                print "</td></tr>";
-            }
+				print "</td></tr>";
+			}
 
-            // Other attributes
-            $parameters = array();
-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			// Other attributes
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 
-            print '</table>';
+			print '</table>';
 
-            print '<br><div class="center">';
+			print '<br><div class="center">';
 			print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
 			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-            print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
-            print '</div>';
+			print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';
+			print '</div>';
 
-            print '</form>';
+			print '</form>';
 
-            print '</div>';
-        } else {
-            /*
+			print '</div>';
+		} else {
+			/*
              * Confirm delete trip
              */
-            if ($action == 'delete')
-            {
-                print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
-            }
+			if ($action == 'delete')
+			{
+				print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$id, $langs->trans("DeleteTrip"), $langs->trans("ConfirmDeleteTrip"), "confirm_delete");
+			}
 
-            $soc = new Societe($db);
-            if ($object->socid) $soc->fetch($object->socid);
+			$soc = new Societe($db);
+			if ($object->socid) $soc->fetch($object->socid);
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/compta/deplacement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-            // Ref
-            print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
-            print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
-            print '</td></tr>';
+			// Ref
+			print '<tr><td width="25%">'.$langs->trans("Ref").'</td><td>';
+			print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', '');
+			print '</td></tr>';
 
-	        $form->load_cache_types_fees();
+			$form->load_cache_types_fees();
 
-	        // Type
-            print '<tr><td>';
-            print $form->editfieldkey("Type", 'type', $langs->trans($object->type), $object, $user->rights->deplacement->creer, 'select:types_fees');
-            print '</td><td>';
-            print $form->editfieldval("Type", 'type', $form->cache_types_fees[$object->type], $object, $user->rights->deplacement->creer, 'select:types_fees');
-            print '</td></tr>';
+			// Type
+			print '<tr><td>';
+			print $form->editfieldkey("Type", 'type', $langs->trans($object->type), $object, $user->rights->deplacement->creer, 'select:types_fees');
+			print '</td><td>';
+			print $form->editfieldval("Type", 'type', $form->cache_types_fees[$object->type], $object, $user->rights->deplacement->creer, 'select:types_fees');
+			print '</td></tr>';
 
-            // Who
-            print '<tr><td>'.$langs->trans("Person").'</td><td>';
-            $userfee = new User($db);
-            $userfee->fetch($object->fk_user);
-            print $userfee->getNomUrl(1);
-            print '</td></tr>';
+			// Who
+			print '<tr><td>'.$langs->trans("Person").'</td><td>';
+			$userfee = new User($db);
+			$userfee->fetch($object->fk_user);
+			print $userfee->getNomUrl(1);
+			print '</td></tr>';
 
-            // Date
-            print '<tr><td>';
-            print $form->editfieldkey("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
-            print '</td><td>';
-            print $form->editfieldval("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
-            print '</td></tr>';
+			// Date
+			print '<tr><td>';
+			print $form->editfieldkey("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
+			print '</td><td>';
+			print $form->editfieldval("Date", 'dated', $object->date, $object, $user->rights->deplacement->creer, 'datepicker');
+			print '</td></tr>';
 
-            // Km/Price
-            print '<tr><td class="tdtop">';
-            print $form->editfieldkey("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
-            print '</td><td>';
-            print $form->editfieldval("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
-            print "</td></tr>";
+			// Km/Price
+			print '<tr><td class="tdtop">';
+			print $form->editfieldkey("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
+			print '</td><td>';
+			print $form->editfieldval("FeesKilometersOrAmout", 'km', $object->km, $object, $user->rights->deplacement->creer, 'numeric:6');
+			print "</td></tr>";
 
-            // Where
-            print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
-            print '<td>';
-            if ($soc->id) print $soc->getNomUrl(1);
-            print '</td></tr>';
+			// Where
+			print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
+			print '<td>';
+			if ($soc->id) print $soc->getNomUrl(1);
+			print '</td></tr>';
 
-            // Project
-            if (!empty($conf->projet->enabled))
-            {
-                $langs->load('projects');
-                print '<tr>';
-                print '<td>';
+			// Project
+			if (!empty($conf->projet->enabled))
+			{
+				$langs->load('projects');
+				print '<tr>';
+				print '<td>';
 
-                print '<table class="nobordernopadding" width="100%"><tr><td>';
-                print $langs->trans('Project');
-                print '</td>';
-                if ($action != 'classify' && $user->rights->deplacement->creer)
-                {
-                    print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
-                    print img_edit($langs->trans('SetProject'), 1);
-                    print '</a></td>';
-                }
-                print '</tr></table>';
-                print '</td><td colspan="3">';
-                if ($action == 'classify')
-                {
-                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
-                } else {
-                    $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
-                }
-                print '</td>';
-                print '</tr>';
-            }
+				print '<table class="nobordernopadding" width="100%"><tr><td>';
+				print $langs->trans('Project');
+				print '</td>';
+				if ($action != 'classify' && $user->rights->deplacement->creer)
+				{
+					print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=classify&amp;id='.$object->id.'">';
+					print img_edit($langs->trans('SetProject'), 1);
+					print '</a></td>';
+				}
+				print '</tr></table>';
+				print '</td><td colspan="3">';
+				if ($action == 'classify')
+				{
+					$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1);
+				} else {
+					$form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0);
+				}
+				print '</td>';
+				print '</tr>';
+			}
 
-            // Statut
-            print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
+			// Statut
+			print '<tr><td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
-        	// Other attributes
-        	$parameters = array('socid'=>$object->id);
-        	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$parameters = array('socid'=>$object->id);
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-            print "</table><br>";
+			print "</table><br>";
 
-            // Notes
-            $blocname = 'notes';
-            $title = $langs->trans('Notes');
-            include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
+			// Notes
+			$blocname = 'notes';
+			$title = $langs->trans('Notes');
+			include DOL_DOCUMENT_ROOT.'/core/tpl/bloc_showhide.tpl.php';
 
-            print '</div>';
+			print '</div>';
 
-            /*
+			/*
              * Barre d'actions
              */
 
-            print '<div class="tabsAction">';
+			print '<div class="tabsAction">';
 
-            if ($object->statut < Deplacement::STATUS_REFUNDED) 	// if not refunded
-            {
-	            if ($user->rights->deplacement->creer)
-	            {
-	                print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
-	            } else {
-	                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
-	            }
-            }
+			if ($object->statut < Deplacement::STATUS_REFUNDED) 	// if not refunded
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&id='.$id.'">'.$langs->trans('Modify').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
+				}
+			}
 
-            if ($object->statut == Deplacement::STATUS_DRAFT) 	// if draft
-            {
-                if ($user->rights->deplacement->creer)
-                {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
-                } else {
-                    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
-                }
-            }
+			if ($object->statut == Deplacement::STATUS_DRAFT) 	// if draft
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=validate&id='.$id.'">'.$langs->trans('Validate').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Validate').'</a>';
+				}
+			}
 
-            if ($object->statut == Deplacement::STATUS_VALIDATED) 	// if validated
-            {
-                if ($user->rights->deplacement->creer)
-                {
-                    print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
-                } else {
-                    print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
-                }
-            }
+			if ($object->statut == Deplacement::STATUS_VALIDATED) 	// if validated
+			{
+				if ($user->rights->deplacement->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=classifyrefunded&id='.$id.'">'.$langs->trans('ClassifyRefunded').'</a>';
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('ClassifyRefunded').'</a>';
+				}
+			}
 
-            if ($user->rights->deplacement->supprimer)
-            {
-                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
-            } else {
-                print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
-            }
+			if ($user->rights->deplacement->supprimer)
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$id.'">'.$langs->trans('Delete').'</a>';
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
+			}
 
-            print '</div>';
-        }
-    } else {
-        dol_print_error($db);
-    }
+			print '</div>';
+		}
+	} else {
+		dol_print_error($db);
+	}
 }
 
 // End of page
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 113068c447c..3ab212a62bd 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -188,8 +188,8 @@ if (empty($reshook))
 
 		if (!$error)
 		{
-			$object->titre = GETPOST('titre', 'nohtml'); // deprecated
-			$object->title = GETPOST('titre', 'nohtml');
+			$object->titre = GETPOST('title', 'nohtml'); // deprecated
+			$object->title = GETPOST('title', 'nohtml');
 			$object->note_private = GETPOST('note_private', 'restricthtml');
             $object->note_public = GETPOST('note_public', 'restricthtml');
             $object->model_pdf = GETPOST('modelpdf', 'alpha');
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 7b0d7fcf869..8a2b5b150e4 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4118,17 +4118,13 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('DateInvoice');
 	print '</td>';
-	if ($object->type != Facture::TYPE_CREDIT_NOTE && $action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
+	if ($action != 'editinvoicedate' && !empty($object->brouillon) && $usercancreate && empty($conf->global->FAC_FORCE_DATE_VALIDATION))
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editinvoicedate&amp;facid='.$object->id.'">'.img_edit($langs->trans('SetDate'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td>';
 
-	if ($object->type != Facture::TYPE_CREDIT_NOTE) {
-		if ($action == 'editinvoicedate') {
-			$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date, 'invoicedate');
-		} else {
-			print dol_print_date($object->date, 'day');
-		}
+	if ($action == 'editinvoicedate') {
+		$form->form_date($_SERVER['PHP_SELF'].'?facid='.$object->id, $object->date, 'invoicedate');
 	} else {
 		print dol_print_date($object->date, 'day');
 	}
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 643fb7eddd0..0ab4974ce7f 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -996,6 +996,8 @@ class Invoices extends DolibarrApi
      */
     public function markAsCreditAvailable($id)
     {
+		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
+
         if (!DolibarrApiAccess::$user->rights->facture->creer) {
             throw new RestException(401);
         }
@@ -1497,7 +1499,7 @@ class Invoices extends DolibarrApi
         	    $amount = price2num($amountarray["multicurrency_amount"], 'MT');
         	}
 
-			if ($amount > $remainstopay && $accepthigherpayment == false) {
+			if ($amount > $remainstopay && !$accepthigherpayment) {
 				$this->db->rollback();
         		throw new RestException(400, 'Payment amount on invoice ID '.$id.' ('.$amount.') is higher than remain to pay ('.$remainstopay.')');
 			}
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index c288251f56a..d1a6abcdec3 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -74,6 +74,11 @@ class FactureRec extends CommonInvoice
 	 */
 	protected $table_ref_field = 'titre';
 
+	/**
+	 * @var string The label of recurring invoice
+	 */
+	public $title;
+
 	public $number;
 	public $date;
 	public $remise;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 8ec349c79f4..0c6b438b376 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -4738,10 +4738,7 @@ class FactureLigne extends CommonInvoiceLine
 	public $fk_facture;
 	//! Id parent line
 	public $fk_parent_line;
-	/**
-	 * @deprecated
-	 */
-	public $label;
+
 	//! Description ligne
 	public $desc;
 	public $ref_ext; // External reference of the line
@@ -4771,21 +4768,6 @@ class FactureLigne extends CommonInvoiceLine
 	public $date_start;
 	public $date_end;
 
-	// From llx_product
-	/**
-	 * @deprecated
-	 * @see $product_ref
-	 */
-	public $ref; // Product ref (deprecated)
-	public $product_ref; // Product ref
-	/**
-	 * @deprecated
-	 * @see $product_label
-	 */
-	public $libelle; // Product label (deprecated)
-	public $product_label; // Product label
-	public $product_desc; // Description produit
-
 	public $skip_update_total; // Skip update price total for special lines
 
 	/**
@@ -4825,7 +4807,7 @@ class FactureLigne extends CommonInvoiceLine
 		$sql .= ' fd.multicurrency_total_ht,';
 		$sql .= ' fd.multicurrency_total_tva,';
 		$sql .= ' fd.multicurrency_total_ttc,';
-		$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facturedet as fd';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON fd.fk_product = p.rowid';
 		$sql .= ' WHERE fd.rowid = '.$rowid;
@@ -4871,10 +4853,11 @@ class FactureLigne extends CommonInvoiceLine
 			$this->marque_tx			= $marginInfos[2];
 
 			$this->ref = $objp->product_ref; // deprecated
-			$this->product_ref = $objp->product_ref;
-			$this->libelle				= $objp->product_libelle; // deprecated
-			$this->product_label		= $objp->product_libelle;
+
+			$this->product_ref          = $objp->product_ref;
+			$this->product_label		= $objp->product_label;
 			$this->product_desc			= $objp->product_desc;
+
 			$this->fk_unit				= $objp->fk_unit;
 			$this->fk_user_modif		= $objp->fk_user_modif;
 			$this->fk_user_author = $objp->fk_user_author;
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index 5c0aacfdb35..fb044280a21 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -51,7 +51,7 @@ $maxOpenCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->glob
 
 llxHeader("", $langs->trans("CustomersInvoicesArea"), "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes");
 
-print load_fiche_titre($langs->trans("CustomersInvoicesArea"), '', 'invoicing');
+print load_fiche_titre($langs->trans("CustomersInvoicesArea"), '', 'bill');
 
 print '<div class="fichecenter">';
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index 400fb3be7ed..16d163c4fe6 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -357,7 +357,7 @@ if ($resql)
 	if (!empty($arrayfields['f.titre']['checked']))
 	{
 		print '<td class="liste_titre left">';
-		print '<input class="flat" size="6" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
 		print '</td>';
 	}
 	// Thirpdarty
@@ -478,7 +478,7 @@ if ($resql)
 	}
 	// Action column
 	print '<td class="liste_titre" align="middle">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0, 'checkforselect', 1);
+	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
 	print "</tr>\n";
@@ -502,7 +502,7 @@ if ($resql)
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	if (!empty($arrayfields['status']['checked']))          print_liste_field_titre($arrayfields['status']['label'], $_SERVER['PHP_SELF'], "f.suspended,f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'nomaxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
 	if ($num > 0)
@@ -529,7 +529,7 @@ if ($resql)
 
 			if (!empty($arrayfields['f.titre']['checked']))
 			{
-			    print '<td>';
+			    print '<td class="nowrap tdoverflowmax200">';
 			    print $invoicerectmp->getNomUrl(1);
 			    print "</a>";
 			    print "</td>\n";
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 607afbc943f..4f795274ad2 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -39,6 +39,9 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+if (!empty($conf->margin->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
+}
 require_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
@@ -203,6 +206,10 @@ $arrayfields = array(
 	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>200),
 	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>210),
 	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>220), // Not enabled by default because slow
+	'total_pa' => array('label' => ($conf->global->MARGIN_TYPE == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled)?0:1)),
+	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled)?0:1)),
+	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || empty($conf->global->DISPLAY_MARGIN_RATES)?0:1)),
+	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || empty($conf->global->DISPLAY_MARK_RATES)?0:1)),
 	'f.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
 	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
 	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
@@ -405,6 +412,10 @@ if ($massaction == 'makepayment'){
 $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
+$formmargin = null;
+if (!empty($conf->margin->enabled)) {
+	$formmargin = new FormMargin($db);
+}
 $bankaccountstatic = new Account($db);
 $facturestatic = new Facture($db);
 $formcompany = new FormCompany($db);
@@ -729,7 +740,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -738,7 +749,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -1019,6 +1030,26 @@ if ($resql)
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['total_pa']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_margin_rate']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['total_mark_rate']['checked']))
+	{
+		print '<td class="liste_titre right">';
+		print '</td>';
+	}
 
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -1056,7 +1087,7 @@ if ($resql)
 	{
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$liststatus = array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
-		print $form->selectarray('search_status', $liststatus, $search_status, 1);
+		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td>';
 	}
 	// Action column
@@ -1102,6 +1133,10 @@ if ($resql)
 	if (!empty($arrayfields['f.multicurrency_total_ttc']['checked']))     print_liste_field_titre($arrayfields['f.multicurrency_total_ttc']['label'], $_SERVER['PHP_SELF'], 'f.multicurrency_total_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (!empty($arrayfields['multicurrency_dynamount_payed']['checked'])) print_liste_field_titre($arrayfields['multicurrency_dynamount_payed']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
 	if (!empty($arrayfields['multicurrency_rtp']['checked']))             print_liste_field_titre($arrayfields['multicurrency_rtp']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['total_pa']['checked']))					  print_liste_field_titre($arrayfields['total_pa']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['total_margin']['checked']))                  print_liste_field_titre($arrayfields['total_margin']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['total_margin_rate']['checked']))             print_liste_field_titre($arrayfields['total_margin_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['total_mark_rate']['checked']))               print_liste_field_titre($arrayfields['total_mark_rate']['label'], $_SERVER['PHP_SELF'], '', '', $param, 'class="right"', $sortfield, $sortorder);
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
@@ -1205,6 +1240,12 @@ if ($resql)
 
 			$facturestatic->alreadypaid = $paiement;
 
+			$marginInfo = array();
+			if (!empty($conf->margin->enabled)) {
+				$facturestatic->fetch_lines();
+				$marginInfo = $formmargin->getMarginInfosArray($facturestatic);
+			}
+
             print '<tr class="oddeven"';
             if ($contextpage == 'poslist')
             {
@@ -1541,6 +1582,31 @@ if ($resql)
 				if (!$i) $totalarray['nbfield']++;
 			}
 
+			// Total buying or cost price
+			if (!empty($arrayfields['total_pa']['checked']))
+			{
+				print '<td class="right nowrap">' . price($marginInfo['pa_total']) . '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Total margin
+			if (!empty($arrayfields['total_margin']['checked']))
+			{
+				print '<td class="right nowrap">' . price($marginInfo['total_margin']) . '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// Total margin rate
+			if (!empty($arrayfields['total_margin_rate']['checked']))
+			{
+				print '<td class="right nowrap">' . (($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, 2).'%') . '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+			// total mark rate
+			if (!empty($arrayfields['total_mark_rate']['checked']))
+			{
+				print '<td class="right nowrap">' . (($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, 2).'%') . '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
+
 			// Extra fields
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 			// Fields from hook
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index 8c144f6bd71..0591d75d5a3 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -213,11 +213,11 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				$companystatic->code_compta = $obj->code_compta;
 				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td class="nowrap">';
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
 				print $facturestatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td class="nowrap">';
-				print $companystatic->getNomUrl(1, 'customer', 16);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $companystatic->getNomUrl(1, 'customer');
 				print '</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
 				print '</tr>';
@@ -305,11 +305,11 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$companystatic->code_compta = $obj->code_compta;
 				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td class="nowrap">';
-				print $facturesupplierstatic->getNomUrl(1, '', 16);
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
+				print $facturesupplierstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>';
-				print $companystatic->getNomUrl(1, 'supplier', 16);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $companystatic->getNomUrl(1, 'supplier');
 				print '</td>';
 				print '<td class="right">'.price($obj->total_ttc).'</td>';
 				print '</tr>';
@@ -550,11 +550,11 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$thirdpartystatic->code_compta = '';
 				$thirdpartystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven nowraponall"><td>';
+				print '<tr class="oddeven nowraponall tdoverflowmax100"><td>';
 				print $facstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>';
-				print $thirdpartystatic->getNomUrl(1, 'supplier', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $thirdpartystatic->getNomUrl(1, 'supplier');
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
@@ -647,7 +647,7 @@ if (!empty($conf->don->enabled) && $user->rights->don->lire)
 				$label = $donationstatic->getFullName($langs);
 				if ($objp->societe) $label .= ($label ? ' - ' : '').$objp->societe;
 
-				print '<tr class="oddeven">';
+				print '<tr class="oddeven tdoverflowmax100">';
 				print '<td>'.$donationstatic->getNomUrl(1).'</td>';
 				print '<td>'.$label.'</td>';
 				print '<td class="nowrap right">'.price($objp->amount).'</td>';
@@ -734,7 +734,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire)
 					$chargestatic->paye = $obj->paye;
 
 					print '<tr class="oddeven">';
-					print '<td>'.$chargestatic->getNomUrl(1).'</td>';
+					print '<td class="nowraponall">'.$chargestatic->getNomUrl(1).'</td>';
 					print '<td class="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
 					print '<td class="nowrap right">'.price($obj->amount).'</td>';
 					print '<td class="nowrap right">'.price($obj->sumpaid).'</td>';
@@ -875,8 +875,8 @@ if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user
 
 				print '</td>';
 
-				print '<td class="left">';
-                print $societestatic->getNomUrl(1, 'customer', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+                print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
@@ -1022,8 +1022,8 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 				print '</td></tr></table>';
 
 				print '</td>';
-				print '<td class="left">';
-				print $societestatic->getNomUrl(1, 'customer', 44);
+				print '<td class="nowrap tdoverflowmax100">';
+				print $societestatic->getNomUrl(1, 'customer');
 				print '</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->datelimite), 'day').'</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
@@ -1040,8 +1040,10 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 			}
 
 			if ($othernb) {
+				$colspan = 6;
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 				print '<tr class="oddeven">';
-				print '<td class="nowrap" colspan="5">';
+				print '<td class="nowrap" colspan="'.$colspan.'">';
 				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
 				print '</td>';
 				print "</tr>\n";
@@ -1157,10 +1159,10 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 				$societestatic->code_compta = $obj->code_compta;
 				$societestatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
 
-				print '<tr class="oddeven"><td>';
+				print '<tr class="oddeven"><td class="nowrap tdoverflowmax100">';
 				print $facstatic->getNomUrl(1, '');
 				print '</td>';
-				print '<td>'.$societestatic->getNomUrl(1, 'supplier', 44).'</td>';
+				print '<td class="nowrap tdoverflowmax100">'.$societestatic->getNomUrl(1, 'supplier').'</td>';
 				print '<td class="right">'.dol_print_date($db->jdate($obj->date_lim_reglement), 'day').'</td>';
 				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td class="right">'.price($obj->total_ht).'</td>';
 				print '<td class="nowrap right">'.price($obj->total_ttc).'</td>';
@@ -1174,8 +1176,10 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			}
 
 			if ($othernb) {
+				$colspan = 6;
+				if (!empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) $colspan++;
 				print '<tr class="oddeven">';
-				print '<td class="nowrap" colspan="5">';
+				print '<td class="nowrap" colspan="'.$colspan.'">';
 				print '<span class="opacitymedium">'.$langs->trans("More").'... ('.$othernb.')</span>';
 				print '</td>';
 				print "</tr>\n";
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 9d86cff65dd..efe102c48b2 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -207,7 +207,7 @@ if (empty($reshook))
 	    {
 	        $action = 'create';
 	    }
-	    // Le reste propre a cette action s'affiche en bas de page.
+	    // The next of this action is displayed at the page's bottom.
 	}
 
 	/*
@@ -249,7 +249,7 @@ if (empty($reshook))
 
 	    if (!empty($conf->banque->enabled))
 	    {
-	    	// Si module bank actif, un compte est obligatoire lors de la saisie d'un paiement
+	    	// If the bank module is active, an account is required to input a payment
 	    	if (GETPOST('accountid', 'int') <= 0)
 	    	{
 	    		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('AccountToCredit')), null, 'errors');
@@ -503,7 +503,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         }
         print "</tr>\n";
 
-        // Cheque number
+        // Bank check number
         print '<tr><td>'.$langs->trans('Numero');
         print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
         print '</td>';
@@ -793,7 +793,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
         }
 
 
-        // Bouton Enregistrer
+        // Save button
         if ($action != 'add_paiement')
         {
         	$checkboxlabel = $langs->trans("ClosePaidInvoicesAutomatically");
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index dd7651a6147..84cb8c1dc6f 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -96,12 +96,12 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->facture->
 	}
 }
 
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->facture->paiement)
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture->paiement)
 {
 	$db->begin();
 
     $object->fetch($id);
-	if ($object->valide($user) > 0)
+	if ($object->validate($user) > 0)
 	{
 		$db->commit();
 
@@ -179,17 +179,17 @@ $head = payment_prepare_head($object);
 
 dol_fiche_head($head, 'payment', $langs->trans("PaymentCustomerInvoice"), -1, 'payment');
 
-// Confirmation de la suppression du paiement
+// Confirmation of payment delete
 if ($action == 'delete')
 {
 	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-// Confirmation de la validation du paiement
+// Confirmation of payment validation
 if ($action == 'valide')
 {
 	$facid = $_GET['facid'];
-	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
+	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_validate', '', 0, 2);
 }
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/paiement/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
@@ -408,7 +408,7 @@ if ($resql)
 
 
 /*
- * Boutons Actions
+ * Actions Buttons
  */
 
 print '<div class="tabsAction">';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 71cd900f915..de672af203b 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -178,7 +178,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->banque->c
 	}
 }
 
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->banque->cheque)
+if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->banque->cheque)
 {
 	$result = $object->fetch($id);
 	$result = $object->validate($user);
@@ -312,7 +312,7 @@ if ($action == 'new')
 	dol_fiche_head($head, $hselected, $langs->trans("Cheques"), -1, 'payment');
 
 	/*
-	 * Confirmation de la suppression du bordereau
+	 * Confirmation of slip's delete
 	 */
 	if ($action == 'delete')
 	{
@@ -320,11 +320,11 @@ if ($action == 'new')
 	}
 
 	/*
-	 * Confirmation de la validation du bordereau
+	 * Confirmation of slip's validation
 	 */
 	if ($action == 'valide')
 	{
-		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_valide', '', '', 1);
+		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans("ValidateCheckReceipt"), $langs->trans("ConfirmValidateCheckReceipt"), 'confirm_validate', '', '', 1);
 	}
 
 	/*
@@ -595,7 +595,7 @@ if ($action == 'new')
 	print $accountstatic->getNomUrl(1);
 	print '</td></tr>';
 
-	// Nb of cheques
+	// Number of bank checks
 	print '<tr><td>'.$langs->trans('NbOfCheques').'</td><td colspan="2">';
 	print $object->nbcheque;
 	print '</td></tr>';
@@ -613,7 +613,7 @@ if ($action == 'new')
 	print '</div>';
 
 
-	// List of cheques
+	// List of bank checks
 	$sql = "SELECT b.rowid, b.amount, b.num_chq, b.emetteur,";
 	$sql .= " b.dateo as date, b.datec as datec, b.banque,";
 	$sql .= " p.rowid as pid, ba.rowid as bid, p.statut";
@@ -654,7 +654,7 @@ if ($action == 'new')
     		{
     			print '<tr class="oddeven">';
     			print '<td class="center">'.$i.'</td>';
-    			print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Date operation
+    			print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Operation date
     			print '<td class="center">'.($objp->num_chq ? $objp->num_chq : '&nbsp;').'</td>';
     			print '<td>'.dol_trunc($objp->emetteur, 24).'</td>';
     			print '<td>'.dol_trunc($objp->banque, 24).'</td>';
@@ -707,7 +707,7 @@ if ($action == 'new')
 
 		print "</table>";
 
-		// Cheque denormalized data nbcheque is similar to real number of cheque
+		// Cheque denormalized data nbcheque is similar to real number of bank check
 		if ($num > 0 && $i < ($object->nbcheque + 1)) {
 			// Show warning that some records were removed.
 			$langs->load("errors");
@@ -727,7 +727,7 @@ if ($action == 'new')
 
 
 /*
- * Boutons Actions
+ * Actions Buttons
  */
 
 print '<div class="tabsAction">';
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index 00815c90f7d..cc882b5f1ee 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -98,7 +98,7 @@ class RemiseCheque extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bordereau_cheque as bc";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON bc.fk_bank_account = ba.rowid";
 		$sql .= " WHERE bc.entity = ".$conf->entity;
-		if ($id)  $sql .= " AND bc.rowid = ".$id;
+		if ($id)  $sql .= " AND bc.rowid = ".((int) $id);
 		if ($ref) $sql .= " AND bc.ref = '".$this->db->escape($ref)."'";
 
 		dol_syslog("RemiseCheque::fetch", LOG_DEBUG);
diff --git a/htdocs/compta/paiement/cheque/index.php b/htdocs/compta/paiement/cheque/index.php
index 1ee79aeafd9..5e71ff5c50c 100644
--- a/htdocs/compta/paiement/cheque/index.php
+++ b/htdocs/compta/paiement/cheque/index.php
@@ -99,6 +99,7 @@ $sql .= $db->plimit($max);
 $resql = $db->query($sql);
 if ($resql)
 {
+	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<th>'.$langs->trans("LastCheckReceiptShort", $max).'</th>';
@@ -126,9 +127,9 @@ if ($resql)
 
 		print '<tr class="oddeven">'."\n";
 
-		print '<td>'.$checkdepositstatic->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">'.$checkdepositstatic->getNomUrl(1).'</td>';
 		print '<td>'.dol_print_date($db->jdate($objp->db), 'day').'</td>';
-		print '<td>'.$accountstatic->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">'.$accountstatic->getNomUrl(1).'</td>';
 		print '<td class="right">'.$objp->nbcheque.'</td>';
 		print '<td class="right">'.price($objp->amount).'</td>';
 		print '<td class="right">'.$checkdepositstatic->LibStatut($objp->statut, 3).'</td>';
@@ -136,6 +137,7 @@ if ($resql)
 		print '</tr>';
 	}
 	print "</table>";
+	print '</div>';
 
 	$db->free($resql);
 } else {
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 5cb16bdcbe3..dbef7158782 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -858,13 +858,25 @@ class Paiement extends CommonObject
         return -1; //no num given or already validated
     }
 
-	/**
+    /**
+     *    Validate payment
+     *
+     *	  @param	User	$user		User making validation
+     *    @return   int     			<0 if KO, >0 if OK
+     *    @deprecated
+     */
+    public function valide(User $user = null)
+    {
+    	return $this->validate($user);
+    }
+
+    /**
 	 *    Validate payment
 	 *
 	 *	  @param	User	$user		User making validation
 	 *    @return   int     			<0 if KO, >0 if OK
 	 */
-    public function valide(User $user = null)
+    public function validate(User $user = null)
     {
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element.' SET statut = 1 WHERE rowid = '.$this->id;
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index eb2523960f3..f3ea57ea084 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -1,13 +1,14 @@
 <?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
- * Copyright (C) 2015      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2017      Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018      Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018      Charlene Benke       <charlie@patas-monkey.com>
+/* Copyright (C) 2001-2006	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2013		Cédric Salvador			<csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2018		Charlene Benke			<charlie@patas-monkey.com>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,6 +31,11 @@
  */
 
 require '../../main.inc.php';
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'facture', $facid, '');
+
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -39,136 +45,169 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('bills', 'banks', 'compta', 'companies'));
 
-$action		= GETPOST('action', 'alpha');
-$confirm	= GETPOST('confirm', 'alpha');
-$optioncss = GETPOST('optioncss', 'alpha');
+$action				= GETPOST('action', 'alpha');
+$massaction			= GETPOST('massaction', 'alpha');
+$confirm			= GETPOST('confirm', 'alpha');
+$optioncss			= GETPOST('optioncss', 'alpha');
+$contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'paymentlist';
 
-$facid	= GETPOST('facid', 'int');
-$socid	= GETPOST('socid', 'int');
-$userid = GETPOST('userid', 'int');
-$day = GETPOST('day', 'int');
-$month	= GETPOST('month', 'int');
-$year = GETPOST('year', 'int');
+$facid				= GETPOST('facid', 'int');
+$socid				= GETPOST('socid', 'int');
+$userid				= GETPOST('userid', 'int');
+$day				= GETPOST('day', 'int');
+$month				= GETPOST('month', 'int');
+$year				= GETPOST('year', 'int');
 
-// Security check
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'facture', $facid, '');
+$search_ref			= GETPOST("search_ref", "alpha");
+$search_company		= GETPOST("search_company", 'alpha');
+$search_paymenttype	= GETPOST("search_paymenttype");
+$search_account		= GETPOST("search_account", "int");
+$search_payment_num	= GETPOST('search_payment_num', 'alpha');
+$search_amount		= GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
 
-$paymentstatic = new Paiement($db);
-$accountstatic = new Account($db);
-$companystatic = new Societe($db);
+$limit				= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield			= GETPOST("sortfield", 'alpha');
+$sortorder			= GETPOST("sortorder", 'alpha');
+$page				= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
-$search_ref = GETPOST("search_ref", "alpha");
-$search_account = GETPOST("search_account", "int");
-$search_paymenttype = GETPOST("search_paymenttype");
-$search_amount = GETPOST("search_amount", 'alpha'); // alpha because we must be able to search on "< x"
-$search_company = GETPOST("search_company", 'alpha');
-$search_payment_num = GETPOST('search_payment_num', 'alpha');
-
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) $page = 0;      // If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+
 if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "p.rowid";
+if (!$sortfield) $sortfield = "p.ref";
+
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOSTISSET("search_all", 'alpha') : GETPOST('sall'));
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'p.ref'=>"RefPayment",
+	's.nom'=>"ThirdParty",
+	'p.num_paiement'=>"Numero",
+	'p.amount'=>"Amount",
+);
+
+$arrayfields = array(
+	'p.ref'				=> array('label'=>"RefPayment",				'checked'=>1, 'position'=>10),
+	'p.datep'			=> array('label'=>"Date",					'checked'=>1, 'position'=>20),
+	's.nom'				=> array('label'=>"ThirdParty",				'checked'=>1, 'position'=>30),
+	'c.libelle'			=> array('label'=>"Type",					'checked'=>1, 'position'=>40),
+	'transaction'		=> array('label'=>"BankTransactionLine",	'checked'=>1, 'position'=>50, 'enabled'=>(!empty($conf->banque->enabled))),
+	'ba.label'			=> array('label'=>"Account",				'checked'=>1, 'position'=>60, 'enabled'=>(!empty($conf->banque->enabled))),
+	'p.num_paiement'	=> array('label'=>"Numero",					'checked'=>1, 'position'=>70, 'tooltip'=>"ChequeOrTransferNumber"),
+	'p.amount'			=> array('label'=>"Amount",					'checked'=>1, 'position'=>80),
+	'p.statut'			=> array('label'=>"Status",					'checked'=>1, 'position'=>90, 'enabled'=>(!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentlist'));
-$extrafields = new ExtraFields($db);
-
-$arrayfields = array();
-
+$object = new Paiement($db);
 
 /*
  * Actions
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_account = "";
-	$search_amount = "";
-    $search_paymenttype = "";
-    $search_payment_num = "";
-	$search_company = "";
-    $day = '';
-    $year = '';
-    $month = '';
-    $search_array_options = array();
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		$search_ref = '';
+		$search_account = '';
+		$search_amount = '';
+		$search_paymenttype = '';
+		$search_payment_num = '';
+		$search_company = '';
+		$day = '';
+		$year = '';
+		$month = '';
+		$option = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 }
 
-
 /*
- * 	View
+ * View
  */
 
 $form = new Form($db);
 $formother = new FormOther($db);
+$accountstatic = new Account($db);
+$companystatic = new Societe($db);
+$bankline = new AccountLine($db);
 
 llxHeader('', $langs->trans('ListPayment'));
 
-if (GETPOST("orphelins", "alpha"))
-{
-    // Payments not linked to an invoice. Should not happend. For debug only.
-    $sql = "SELECT p.rowid, p.ref, p.datep as dp, p.amount,";
-    $sql .= " p.statut, p.num_paiement as num_payment,";
-    $sql .= " c.code as paiement_code";
+if (GETPOST("orphelins", "alpha")) {
+	// Payments not linked to an invoice. Should not happend. For debug only.
+	$sql = "SELECT p.ref, p.datep, p.amount, p.statut, p.num_paiement";
+	$sql .= ", c.code as paiement_code";
+
 	// Add fields from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-    $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
-    $sql .= " AND pf.fk_facture IS NULL";
+	$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+	$sql .= " AND pf.fk_facture IS NULL";
+
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 } else {
-    $sql = "SELECT DISTINCT p.rowid, p.ref, p.datep as dp, p.amount,"; // DISTINCT is to avoid duplicate when there is a link to sales representatives
-    $sql .= " p.statut, p.num_paiement as num_payment,";
-    $sql .= " c.code as paiement_code,";
-    $sql .= " ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal,";
-    $sql .= " s.rowid as socid, s.nom as name, s.email";
+	// DISTINCT is to avoid duplicate when there is a link to sales representatives
+	$sql = "SELECT DISTINCT p.ref, p.datep, p.fk_bank, p.amount, p.statut, p.num_paiement";
+	$sql .= ", c.code as paiement_code";
+	$sql .= ", ba.rowid as bid, ba.ref as bref, ba.label as blabel, ba.number, ba.account_number as account_number, ba.fk_accountancy_journal as accountancy_journal";
+	$sql .= ", s.rowid as socid, s.nom as name, s.email";
+
 	// Add fields from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
-    $sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
-    if (!$user->rights->societe->client->voir && !$socid)
-    {
-        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
-    }
-    $sql .= " WHERE p.entity IN (".getEntity('invoice').")";
-    if (!$user->rights->societe->client->voir && !$socid)
-    {
-        $sql .= " AND sc.fk_user = ".$user->id;
-    }
-    if ($socid > 0) $sql .= " AND f.fk_soc = ".$socid;
-    if ($userid)
-    {
-        if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
-        else $sql .= " AND f.fk_user_author = ".$userid;
-    }
-    // Search criteria
-    $sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
-    if ($search_ref)       		    $sql .= natural_search('p.ref', $search_ref);
-    if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
-    if ($search_paymenttype != "")  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
-    if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
-    if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
-    if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+	$sql .= " FROM ".MAIN_DB_PREFIX."paiement as p";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_paiement = c.id";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf ON p.rowid = pf.fk_paiement";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON pf.fk_facture = f.rowid";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
+	}
+	$sql .= " WHERE p.entity IN (".getEntity('invoice').")";
+	if (!$user->rights->societe->client->voir && !$socid) {
+		$sql .= " AND sc.fk_user = ".$user->id;
+	}
+	if ($socid > 0) {
+		$sql .= " AND f.fk_soc = ".$socid;
+	}
+	if ($userid) {
+		if ($userid == -1) $sql .= " AND f.fk_user_author IS NULL";
+		else $sql .= " AND f.fk_user_author = ".$userid;
+	}
+
+	// Search criteria
+	$sql .= dolSqlDateFilter("p.datep", $day, $month, $year);
+	if ($search_ref)       		    $sql .= natural_search('p.ref', $search_ref);
+	if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
+	if ($search_paymenttype != '')  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
+	if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
+	if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
+	if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
+
+	if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+
 	// Add where from hooks
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
@@ -177,209 +216,291 @@ if (GETPOST("orphelins", "alpha"))
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-{
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-	{
+
+	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
 		$page = 0;
 		$offset = 0;
 	}
 }
 
 $sql .= $db->plimit($limit + 1, $offset);
-//print "$sql";
 
 $resql = $db->query($sql);
-if ($resql)
-{
-    $num = $db->num_rows($resql);
-
-    $param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-    $param .= (GETPOST("orphelins") ? "&orphelins=1" : "");
-    $param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : "");
-    $param .= ($search_company ? "&search_company=".urlencode($search_company) : "");
-    $param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : "");
-    $param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : "");
-    if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
-
-    print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="list">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="search_status" value="'.$search_status.'">';
-
-    print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
-
-    print '<div class="div-table-responsive">';
-    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-    // Lines for filters fields
-    print '<tr class="liste_titre_filter">';
-    print '<td class="liste_titre left">';
-    print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-    print '</td>';
-    print '<td class="liste_titre center">';
-    if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-    print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-    $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-    print '</td>';
-    print '<td class="liste_titre">';
-    $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
-    print '</td>';
-    print '<td class="liste_titre">';
-    print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
-    print '</td>';
-    if (!empty($conf->banque->enabled))
-    {
-	    print '<td class="liste_titre">';
-	    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	    print '</td>';
-    }
-    print '<td class="liste_titre right">';
-    print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
-	print '</td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-    if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-    {
-        print '<td class="liste_titre right">';
-        print '</td>';
-    }
-    print "</tr>\n";
-
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "dp", "", $param, '', $sortfield, $sortorder, 'center ');
-    print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "c.libelle", "", $param, "", $sortfield, $sortorder);
-    print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "p.num_paiement", "", $param, "", $sortfield, $sortorder);
-    if (!empty($conf->banque->enabled))
-    {
-        print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-    }
-    print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "p.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-    //print_liste_field_titre("Invoices"),"","","",$param,'class="left"',$sortfield,$sortorder);
-
-	$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;
-
-    if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "p.statut", "", $param, 'class="right"', $sortfield, $sortorder);
-    print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-    print "</tr>\n";
-
-    $i = 0;
-    $totalarray = array();
-    while ($i < min($num, $limit))
-    {
-        $objp = $db->fetch_object($resql);
-
-        $paymentstatic->id = $objp->rowid;
-        $paymentstatic->ref = $objp->ref;
-
-        $companystatic->id = $objp->socid;
-        $companystatic->name = $objp->name;
-        $companystatic->email = $objp->email;
-
-        print '<tr class="oddeven">';
-
-        print '<td>';
-        print $paymentstatic->getNomUrl(1);
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Date
-        $dateformatforpayment = 'day';
-        if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
-        print '<td class="center">'.dol_print_date($db->jdate($objp->dp), $dateformatforpayment).'</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Thirdparty
-        print '<td>';
-        if ($objp->socid > 0)
-        {
-            print $companystatic->getNomUrl(1, '', 24);
-        }
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Type
-        print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Payment number
-        print '<td>'.$objp->num_payment.'</td>';
-        if (!$i) $totalarray['nbfield']++;
-
-        // Account
-	    if (!empty($conf->banque->enabled))
-	    {
-	        print '<td>';
-	        if ($objp->bid > 0)
-	        {
-	            $accountstatic->id = $objp->bid;
-	            $accountstatic->ref = $objp->bref;
-	            $accountstatic->label = $objp->blabel;
-	            $accountstatic->number = $objp->number;
-	            $accountstatic->account_number = $objp->account_number;
-
-				$accountingjournal = new AccountingJournal($db);
-				$accountingjournal->fetch($objp->accountancy_journal);
-				$accountstatic->accountancy_journal = $accountingjournal->code;
-
-	            print $accountstatic->getNomUrl(1);
-	        }
-	        print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-	    }
-
-	    // Amount
-        print '<td class="right">'.price($objp->amount).'</td>';
-        if (!$i) $totalarray['nbfield']++;
-        $totalarray['pos'][7] = 'amount';
-        $totalarray['val']['amount'] += $objp->amount;
-
-        if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-        {
-            print '<td class="right">';
-            if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
-            print $paymentstatic->LibStatut($objp->statut, 5);
-            if ($objp->statut == 0) print '</a>';
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-        }
-
-		print '<td></td>';
-		if (!$i) $totalarray['nbfield']++;
-
-		print '</tr>';
-
-        $i++;
-    }
-
-    // Show total line
-    include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-
-    print "</table>\n";
-    print "</div>";
-    print "</form>\n";
-} else {
-    dol_print_error($db);
+if (!$resql) {
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
 }
 
+$num = $db->num_rows($resql);
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+$param .= (GETPOST("orphelins") ? "&orphelins=1" : '');
+$param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : '');
+$param .= ($search_company ? "&search_company=".urlencode($search_company) : '');
+$param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : '');
+$param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : '');
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($langs->trans("ReceivedCustomersPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+
+print '<tr class="liste_titre_filter">';
+
+// Filters: Lines (placeholder)
+print '<tr class="liste_titre_filter">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Ref
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['p.datep']['checked'])) {
+	print '<td class="liste_titre center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
+	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
+	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print '</td>';
+}
+
+// Filter: Thirdparty
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '</td>';
+}
+
+// Filter: Payment type
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
+	print '</td>';
+}
+
+// Filter: Bank transaction number
+if (!empty($arrayfields['transaction']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
+	print '</td>';
+}
+
+// Filter: Cheque number (fund transfer)
+if (!empty($arrayfields['p.num_paiement']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['p.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
+
+// Filter: Status (only placeholder)
+if (!empty($arrayfields['p.statut']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print "</tr>";
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.datep']['checked']))				print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], "p.datep", '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.nom']['checked']))				print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.libelle']['checked']))			print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], "c.libelle", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.num_paiement']['checked']))		print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
+if (!empty($arrayfields['transaction']['checked']))			print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], "ba.label", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.amount']['checked']))			print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], "p.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($arrayfields['p.statut']['checked']))			print_liste_field_titre($arrayfields['p.statut']['label'], $_SERVER["PHP_SELF"], "p.statut", '', $param, 'class="right"', $sortfield, $sortorder);
+
+// Hook fields
+$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"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print "</tr>";
+
+$checkedCount = 0;
+foreach ($arrayfields as $column) {
+	if ($column['checked']) {
+		$checkedCount++;
+	}
+}
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$objp = $db->fetch_object($resql);
+
+	$object->id = $objp->rowid;
+	$object->ref = $objp->ref;
+
+	$companystatic->id = $objp->socid;
+	$companystatic->name = $objp->name;
+	$companystatic->email = $objp->email;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td>'.$object->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date
+	if (!empty($arrayfields['p.datep']['checked'])) {
+		$dateformatforpayment = 'day';
+		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
+		print '<td class="center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Thirdparty
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td>';
+		if ($objp->socid > 0) {
+			print $companystatic->getNomUrl(1, '', 24);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Payment type
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		print '<td>'.$langs->trans("PaymentTypeShort".$objp->paiement_code).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Filter: Cheque number (fund transfer)
+	if (!empty($arrayfields['p.num_paiement']['checked'])) {
+		print '<td>'.$objp->num_paiement.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Bank transaction
+	if (!empty($arrayfields['transaction']['checked'])) {
+		$bankline->fetch($objp->fk_bank);
+		print '<td>'.$bankline->getNomUrl(1, 0).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Bank account
+	if (!empty($arrayfields['ba.label']['checked'])) {
+		print '<td>';
+		if ($objp->bid > 0) {
+			$accountstatic->id = $objp->bid;
+			$accountstatic->ref = $objp->bref;
+			$accountstatic->label = $objp->blabel;
+			$accountstatic->number = $objp->number;
+			$accountstatic->account_number = $objp->account_number;
+
+			$accountingjournal = new AccountingJournal($db);
+			$accountingjournal->fetch($objp->accountancy_journal);
+			$accountstatic->accountancy_journal = $accountingjournal->code;
+
+			print $accountstatic->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	if (!empty($arrayfields['p.amount']['checked'])) {
+		print '<td class="right">'.price($objp->amount).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		$totalarray['pos'][$checkedCount] = 'amount';
+		$totalarray['val']['amount'] += $objp->amount;
+	}
+
+	// Status
+	if (!empty($arrayfields['p.statut']['checked'])) {
+		print '<td class="right">';
+		if ($objp->statut == 0) print '<a href="card.php?id='.$objp->rowid.'&amp;action=valide">';
+		print $object->LibStatut($objp->statut, 5);
+		if ($objp->statut == 0) print '</a>';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>';
+
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print "</table>";
+print "</div>";
+print "</form>";
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 5f442ab0b18..706151c5b81 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -109,7 +109,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
     		$paiement = new PaymentSocialContribution($db);
     		$paiement->chid         = $chid;
     		$paiement->datepaye     = $datepaye;
-    		$paiement->amounts      = $amounts; // Tableau de montant
+    		$paiement->amounts      = $amounts; // Amount list
     		$paiement->paiementtype = GETPOST("paiementtype", 'alphanohtml');
     		$paiement->num_payment  = GETPOST("num_payment", 'alphanohtml');
     		$paiement->note         = GETPOST("note", 'restricthtml');
@@ -160,7 +160,7 @@ llxHeader();
 $form = new Form($db);
 
 
-// Formulaire de creation d'un paiement de charge
+// Form of charge payment creation
 if ($action == 'create')
 {
 	$charge->fetch($chid);
@@ -255,7 +255,7 @@ if ($action == 'create')
 	dol_fiche_end();
 
 	/*
- 	 * Autres charges impayees
+ 	 * Other unpaid charges
 	 */
 	$num = 1;
 	$i = 0;
@@ -327,7 +327,7 @@ if ($action == 'create')
 
 	print "</table>";
 
-	// Bouton Save payment
+	// Save payment button
 	print '<br><div class="center"><input type="checkbox" checked name="closepaidcontrib"> '.$langs->trans("ClosePaidContributionsAutomatically");
 	print '<br><input type="submit" class="button" name="save" value="'.$langs->trans('ToMakePayment').'">';
 	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index 0e71c83f6cb..a42d2471adf 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -72,46 +72,6 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->tax->char
 	}
 }
 
-// Validate social contribution
-/*
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->tax->charges->creer)
-{
-	$db->begin();
-
-	$result=$object->valide();
-
-	if ($result > 0)
-	{
-		$db->commit();
-
-		$factures=array();	// TODO Get all id of invoices linked to this payment
-		foreach($factures as $id)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($id);
-
-			$outputlangs = $langs;
-			if (! empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("",$conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->modelpdf, $outputlangs);
-			}
-		}
-
-		header('Location: card.php?id='.$object->id);
-		exit;
-	}
-	else
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-		$db->rollback();
-	}
-}
-*/
-
 
 /*
  * View
@@ -146,19 +106,6 @@ if ($action == 'delete')
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-/*
- * Validation confirmation of payment
- */
-/*
-if ($action == 'valide')
-{
-	$facid = $_GET['facid'];
-	print $form->formconfirm('card.php?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
-
-}
-*/
-
-
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/payments.php">'.$langs->trans("BackToList").'</a>';
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'id', '');
@@ -184,7 +131,7 @@ print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("Pa
 // Numero
 print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_payment.'</td></tr>';
 
-// Montant
+// Amount
 print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
 
 // Note
@@ -288,7 +235,7 @@ if ($resql)
 
 
 /*
- * Boutons Actions
+ * Actions Buttons
  */
 print '<div class="tabsAction">';
 
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 20d600bf9b4..d4f76548363 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -168,7 +168,7 @@ class RejetPrelevement
 				}
 
 				// Payment validation
-				if ($pai->valide() < 0)
+				if ($pai->validate($user) < 0)
 				{
 					$error++;
 					dol_syslog("RejetPrelevement::Create Error payment validation");
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 52d3b9b7fa3..03c103769a3 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -4,7 +4,8 @@
  * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2016      Frédéric France      <frederic.france@free.fr>
  * Copyright (C) 2020      Pierre Ardoin     	<mapiolca@me.com>
- *
+ * Copyright (C) 2020		Tobias Sekan		<tobias.sekan@startmail.com>
+
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
@@ -20,12 +21,18 @@
  */
 
 /**
- *   	\file       htdocs/compta/sociales/list.php
- *		\ingroup    tax
- *		\brief      Page to list all social contributions
+ *	\file		htdocs/compta/sociales/list.php
+ *	\ingroup	tax
+ *	\brief		Page to list all social contributions
  */
 
 require '../../main.inc.php';
+
+// Security check
+$socid = isset($_GET["socid"]) ? $_GET["socid"] : '';
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -35,36 +42,32 @@ if (!empty($conf->projet->enabled)) require_once DOL_DOCUMENT_ROOT.'/projet/clas
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'banks', 'bills'));
 
-$action = GETPOST('action', 'aZ09');
-$massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'sclist';
+$action				= GETPOST('action', 'aZ09');
+$massaction			= GETPOST('massaction', 'alpha');
+$confirm			= GETPOST('confirm', 'alpha');
+$optioncss			= GETPOST('optioncss', 'alpha');
+$contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-// Security check
-$socid = isset($_GET["socid"]) ? $_GET["socid"] : '';
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'tax', '', '', 'charges');
-
-$search_ref = GETPOST('search_ref', 'int');
-$search_label = GETPOST('search_label', 'alpha');
-$search_amount = GETPOST('search_amount', 'alpha');
-$search_status = GETPOST('search_status', 'int');
+$search_ref			= GETPOST('search_ref', 'int');
+$search_label		= GETPOST('search_label', 'alpha');
+$search_amount		= GETPOST('search_amount', 'alpha');
+$search_status		= GETPOST('search_status', 'int');
 $search_day_lim		= GETPOST('search_day_lim', 'int');
-$search_month_lim = GETPOST('search_month_lim', 'int');
+$search_month_lim	= GETPOST('search_month_lim', 'int');
 $search_year_lim	= GETPOST('search_year_lim', 'int');
-$search_project_ref = GETPOST('search_project_ref', 'alpha');
-$search_project = GETPOST('search_project', 'alpha');
+$search_project_ref	= GETPOST('search_project_ref', 'alpha');
+$search_project		= GETPOST('search_project', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$limit				= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield			= GETPOST("sortfield", 'alpha');
+$sortorder			= GETPOST("sortorder", 'alpha');
+$page				= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+
+if (empty($page) || $page == -1) $page = 0;				// If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
+
 if (!$sortfield) $sortfield = "cs.date_ech";
 if (!$sortorder) $sortorder = "DESC";
 
@@ -84,23 +87,50 @@ if (!GETPOSTISSET('search_typeid'))
 	$search_typeid = GETPOST('search_typeid', 'int');
 }
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All test are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_label = "";
-	$search_amount = "";
-	$search_status = '';
-	$search_typeid = "";
-	$year = "";
-	$search_day_lim = '';
-	$search_year_lim = '';
-	$search_month_lim = '';
-	$search_project_ref = '';
-	$search_project = '';
-	$toselect = '';
-	$search_array_options = array();
-}
+$arrayfields = array(
+	'cs.rowid'		=>array('label'=>"Ref",				'checked'=>1, 'position'=>10),
+	'cs.libelle'	=>array('label'=>"Label",			'checked'=>1, 'position'=>20),
+	'cs.fk_type'	=>array('label'=>"Type",			'checked'=>1, 'position'=>30),
+	'p.ref'			=>array('label'=>"ProjectRef",		'checked'=>1, 'position'=>40, 'enable'=>(!empty($conf->projet->enabled))),
+	'cs.date_ech'	=>array('label'=>"Date",			'checked'=>1, 'position'=>50),
+	'cs.periode'	=>array('label'=>"PeriodEndDate",	'checked'=>1, 'position'=>60),
+	'cs.amount'		=>array('label'=>"Amount",			'checked'=>1, 'position'=>70),
+	'cs.paye'		=>array('label'=>"Status",			'checked'=>1, 'position'=>80),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('sclist'));
+$object = new ChargeSociales($db);
+
+/*
+ * Actions
+ */
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// All tests are required to be compatible with all browsers
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		$search_ref = '';
+		$search_label = '';
+		$search_amount = '';
+		$search_status = '';
+		$search_typeid = '';
+		$year = '';
+		$search_day_lim = '';
+		$search_year_lim = '';
+		$search_month_lim = '';
+		$search_project_ref = '';
+		$search_project = '';
+		$search_array_options = array();
+	}
+}
 
 /*
  *	View
@@ -114,8 +144,8 @@ if (!empty($conf->projet->enabled)) $projectstatic = new Project($db);
 
 llxHeader('', $langs->trans("SocialContributions"));
 
-$sql = "SELECT cs.rowid as id, cs.fk_type as type, ";
-$sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode,";
+$sql = "SELECT cs.rowid, cs.fk_type as type, ";
+$sql .= " cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode,";
 if (!empty($conf->projet->enabled)) $sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 $sql .= " c.libelle as type_label,";
 $sql .= " SUM(pc.amount) as alreadypayed";
@@ -135,19 +165,19 @@ $sql .= dolSqlDateFilter("cs.periode", $search_day_lim, $search_month_lim, $sear
 //$sql.= dolSqlDateFilter("cs.periode", 0, 0, $year);
 if ($year > 0)
 {
-    $sql .= " AND (";
-    // Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
-    // ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
-    $sql .= "   (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$db->escape($year)."') ";
-    $sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$db->escape($year)."')";
-    $sql .= ")";
+	$sql .= " AND (";
+	// Si period renseignee on l'utilise comme critere de date, sinon on prend date echeance,
+	// ceci afin d'etre compatible avec les cas ou la periode n'etait pas obligatoire
+	$sql .= "   (cs.periode IS NOT NULL AND date_format(cs.periode, '%Y') = '".$db->escape($year)."') ";
+	$sql .= "OR (cs.periode IS NULL AND date_format(cs.date_ech, '%Y') = '".$db->escape($year)."')";
+	$sql .= ")";
 }
 if ($filtre) {
-    $filtre = str_replace(":", "=", $filtre);
-    $sql .= " AND ".$filtre;
+	$filtre = str_replace(":", "=", $filtre);
+	$sql .= " AND ".$filtre;
 }
 if ($search_typeid) {
-    $sql .= " AND cs.fk_type=".$db->escape($search_typeid);
+	$sql .= " AND cs.fk_type=".$db->escape($search_typeid);
 }
 $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, c.libelle";
 if (!empty($conf->projet->enabled)) $sql .= ", p.rowid, p.ref, p.title";
@@ -157,193 +187,275 @@ $totalnboflines = 0;
 $result = $db->query($sql);
 if ($result)
 {
-    $totalnboflines = $db->num_rows($result);
+	$totalnboflines = $db->num_rows($result);
 }
 $sql .= $db->plimit($limit + 1, $offset);
 
 $resql = $db->query($sql);
-if ($resql)
+if (!$resql)
 {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-	if ($search_ref)    $param .= '&search_ref='.urlencode($search_ref);
-	if ($search_label)  $param .= '&search_label='.urlencode($search_label);
-	if ($search_project_ref >= 0) $param .= "&search_project_ref=".urlencode($search_project_ref);
-	if ($search_amount) $param .= '&search_amount='.urlencode($search_amount);
-	if ($search_typeid) $param .= '&search_typeid='.urlencode($search_typeid);
-	if ($search_status != '' && $search_status != '-1') $param .= '&search_status='.urlencode($search_status);
-	if ($year)          $param .= '&year='.urlencode($year);
-
-	$newcardbutton = '';
-	if ($user->rights->tax->charges->creer)
-	{
-		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewSocialContribution'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/sociales/card.php?action=create');
-	}
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="search_status" value="'.$search_status.'">';
-
-	$center = '';
-	if ($year)
-	{
-	    $center = ($year ? "<a href='list.php?year=".($year - 1)."'>".img_previous()."</a> ".$langs->trans("Year")." $year <a href='list.php?year=".($year + 1)."'>".img_next()."</a>" : "");
-	}
-
-	print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
-
-	if (empty($mysoc->country_id) && empty($mysoc->country_code))
-	{
-		print '<div class="error">';
-		$langs->load("errors");
-		$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
-		print $countrynotdefined;
-		print '</div>';
-	} else {
-	    print '<div class="div-table-responsive">';
-	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-		print '<tr class="liste_titre_filter">';
-		// Ref
-		print '<td class="liste_titre" align="left">';
-		print '<input class="flat maxwidth75" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-		print '</td>';
-		// Label
-		print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-		// Type
-		print '<td class="liste_titre" align="left">';
-	    $formsocialcontrib->select_type_socialcontrib($search_typeid, 'search_typeid', 1, 0, 0, 'maxwidth100onsmartphone');
-	    print '</td>';
-		// Ref Project
-	   	if (!empty($conf->projet->enabled)) print '<td class="liste_titre"><input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'"></td>';
-	    // Date
-	    print '<td class="liste_titre">&nbsp;</td>';
-	    // Period end date
-		print '<td class="liste_titre center">';
-		if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
-		print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_lim" value="'.dol_escape_htmltag($search_month_lim).'">';
-		$formother->select_year($search_year_lim ? $search_year_lim : -1, 'search_year_lim', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
-		print '</td>';
-	    // Amount
-		print '<td class="liste_titre right">';
-		print '<input class="flat maxwidth75" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
-		print '</td>';
-		// Status
-		print '<td class="liste_titre maxwidthonsmartphone right">';
-		$liststatus = array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
-		print $form->selectarray('search_status', $liststatus, $search_status, 1);
-		print '</td>';
-
-        print '<td class="liste_titre maxwidthsearch">';
-        $searchpicto = $form->showFilterAndCheckAddButtons(0);
-        print $searchpicto;
-        print '</td>';
-		print "</tr>\n";
-
-		print '<tr class="liste_titre">';
-		print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "id", "", $param, "", $sortfield, $sortorder);
-		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "cs.libelle", "", $param, 'class="left"', $sortfield, $sortorder);
-		print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, 'class="left"', $sortfield, $sortorder);
-		if (!empty($conf->projet->enabled)) print_liste_field_titre('ProjectRef', $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
-		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "periode", "", $param, 'align="center"', $sortfield, $sortorder);
-		print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
-		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cs.paye", "", $param, 'class="right"', $sortfield, $sortorder);
-		print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-		print "</tr>\n";
-
-		$i = 0;
-		$totalarray = array();
-		while ($i < min($num, $limit))
-		{
-			$obj = $db->fetch_object($resql);
-
-			$chargesociale_static->id = $obj->id;
-			$chargesociale_static->ref = $obj->id;
-			$chargesociale_static->label = $obj->label;
-			$chargesociale_static->type_label = $obj->type_label;
-			if (!empty($conf->projet->enabled)) {
-				$projectstatic->id = $obj->project_id;
-				$projectstatic->ref = $obj->project_ref;
-				$projectstatic->title = $obj->project_label;
-			}
-
-			print '<tr class="oddeven">';
-
-			// Ref
-			print "<td>".$chargesociale_static->getNomUrl(1, '20')."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-
-			// Label
-			print "<td>".dol_trunc($obj->label, 42)."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-
-			// Type
-			print "<td>".$obj->type_label."</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-
-			// Project Ref
-			if (!empty($conf->projet->enabled)) {
-				print '<td class="nowrap">';
-				if ($obj->project_id > 0)
-				{
-				    print $projectstatic->getNomUrl(1);
-				}
-				print '</td>';
-				if (!$i) $totalarray['nbfield']++;
-			}
-
-			// Date
-			print '<td width="110" align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
-			if (!$i) $totalarray['nbfield']++;
-
-			// Date end period
-			print '<td class="center">';
-			if ($obj->periode)
-			{
-				print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">'.dol_print_date($db->jdate($obj->periode), 'day').'</a>';
-			} else {
-				print '&nbsp;';
-			}
-			print "</td>\n";
-			if (!$i) $totalarray['nbfield']++;
-
-			// Amount
-			print '<td class="nowrap right">'.price($obj->amount).'</td>';
-			if (!$i) $totalarray['nbfield']++;
-			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
-			$totalarray['val']['totalttcfield'] += $obj->amount;
-
-			print '<td class="nowrap right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
-			if (!$i) $totalarray['nbfield']++;
-
-			print '<td></td>';
-
-			if (!$i) $totalarray['nbfield']++;
-
-			print '</tr>';
-			$i++;
-		}
-
-		// Show total line
-		include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-		print '</table>';
-		print '</div>';
-	}
-	print '</form>';
-} else {
 	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
 }
 
+$num = $db->num_rows($resql);
+$i = 0;
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($search_ref)    $param .= '&search_ref='.urlencode($search_ref);
+if ($search_label)  $param .= '&search_label='.urlencode($search_label);
+if ($search_project_ref >= 0) $param .= "&search_project_ref=".urlencode($search_project_ref);
+if ($search_amount) $param .= '&search_amount='.urlencode($search_amount);
+if ($search_typeid) $param .= '&search_typeid='.urlencode($search_typeid);
+if ($search_status != '' && $search_status != '-1') $param .= '&search_status='.urlencode($search_status);
+if ($year)          $param .= '&year='.urlencode($year);
+
+$newcardbutton = '';
+if ($user->rights->tax->charges->creer)
+{
+	$newcardbutton .= dolGetButtonTitle($langs->trans('MenuNewSocialContribution'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/sociales/card.php?action=create');
+}
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$center = '';
+if ($year)
+{
+	$center = '<a href="list.php?year='.($year - 1).'">'.img_previous().'</a>';
+	$center .= ' '.$langs->trans("Year").' '.$year;
+	$center .= ' <a href="list.php?year='.($year + 1).'">'.img_next().'</a>';
+}
+
+print_barre_liste($langs->trans("SocialContributions"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $center, $num, $totalnboflines, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+if (empty($mysoc->country_id) && empty($mysoc->country_code))
+{
+	print '<div class="error">';
+	$langs->load("errors");
+	$countrynotdefined = $langs->trans("ErrorSetACountryFirst");
+	print $countrynotdefined;
+	print '</div>';
+
+	print '</form>';
+	llxFooter();
+	$db->close();
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">'."\n";
+
+print '<tr class="liste_titre_filter">';
+
+// Filters: Line number (placeholder)
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Ref
+if (!empty($arrayfields['cs.rowid']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	print '<input class="flat maxwidth75" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Label
+if (!empty($arrayfields['cs.rowid']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat maxwidth100" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['cs.fk_type']['checked'])) {
+	print '<td class="liste_titre" align="left">';
+	$formsocialcontrib->select_type_socialcontrib($search_typeid, 'search_typeid', 1, 0, 0, 'maxwidth100onsmartphone', 1);
+	print '</td>';
+}
+
+// Filter: Project ref
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" size="6" name="search_project_ref" value="'.$search_project_ref.'">';
+	print '</td>';
+}
+
+// Filter: Date (placeholder)
+if (!empty($arrayfields['cs.date_ech']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Period end date
+if (!empty($arrayfields['cs.periode']['checked'])) {
+	print '<td class="liste_titre center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day_lim" value="'.dol_escape_htmltag($search_day_lim).'">';
+	print '<input class="flat valignmiddle width25" type="text" size="1" maxlength="2" name="search_month_lim" value="'.dol_escape_htmltag($search_month_lim).'">';
+	$formother->select_year($search_year_lim ? $search_year_lim : -1, 'search_year_lim', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['cs.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat maxwidth75" type="text" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
+
+// Filter: Status
+if (!empty($arrayfields['cs.paye']['checked'])) {
+	print '<td class="liste_titre maxwidthonsmartphone right">';
+	$liststatus = array('0'=>$langs->trans("Unpaid"), '1'=>$langs->trans("Paid"));
+	print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Filter: Buttons
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print '</tr>';
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.rowid']['checked']))			print_liste_field_titre($arrayfields['cs.rowid']['label'], $_SERVER["PHP_SELF"], "cs.rowid", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.libelle']['checked']))			print_liste_field_titre($arrayfields['cs.libelle']['label'], $_SERVER["PHP_SELF"], "cs.libelle", '', $param, 'class="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.fk_type']['checked']))			print_liste_field_titre($arrayfields['cs.fk_type']['label'], $_SERVER["PHP_SELF"], "cs.fk_type", '', $param, 'class="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.date_ech']['checked']))			print_liste_field_titre($arrayfields['cs.date_ech']['label'], $_SERVER["PHP_SELF"], "cs.date_ech", '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.periode']['checked']))			print_liste_field_titre($arrayfields['cs.periode']['label'], $_SERVER["PHP_SELF"], "cs.periode", '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.amount']['checked']))			print_liste_field_titre($arrayfields['cs.amount']['label'], $_SERVER["PHP_SELF"], "cs.amount", '', $param, 'class="right"', $sortfield, $sortorder);
+if (!empty($arrayfields['cs.paye']['checked']))				print_liste_field_titre($arrayfields['cs.paye']['label'], $_SERVER["PHP_SELF"], "cs.paye", '', $param, 'class="right"', $sortfield, $sortorder);
+
+// Hook fields
+$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, 'maxwidthsearch ');
+print '</tr>';
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit))
+{
+	$obj = $db->fetch_object($resql);
+
+	$chargesociale_static->id = $obj->rowid;
+	$chargesociale_static->ref = $obj->rowid;
+	$chargesociale_static->label = $obj->libelle;
+	$chargesociale_static->type_label = $obj->type_label;
+	if (!empty($conf->projet->enabled)) {
+		$projectstatic->id = $obj->project_id;
+		$projectstatic->ref = $obj->project_ref;
+		$projectstatic->title = $obj->project_label;
+	}
+
+	print '<tr class="oddeven">';
+
+	// Line number
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['cs.rowid']['checked'])) {
+		print '<td>'.$chargesociale_static->getNomUrl(1, '20').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Label
+	if (!empty($arrayfields['cs.libelle']['checked'])) {
+		print '<td>'.dol_trunc($obj->libelle, 42).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Type
+	if (!empty($arrayfields['cs.fk_type']['checked'])) {
+		print '<td>'.$obj->type_label.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Project ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td class="nowrap">';
+		if ($obj->project_id > 0) {
+			print $projectstatic->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date
+	if (!empty($arrayfields['cs.date_ech']['checked'])) {
+		print '<td width="110" align="center">'.dol_print_date($db->jdate($obj->date_ech), 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date end period
+	if (!empty($arrayfields['cs.periode']['checked'])) {
+		print '<td class="center">';
+		if ($obj->periode) {
+			print '<a href="list.php?year='.strftime("%Y", $db->jdate($obj->periode)).'">';
+			print dol_print_date($db->jdate($obj->periode), 'day');
+			print '</a>';
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	if (!empty($arrayfields['cs.amount']['checked'])) {
+		print '<td class="nowrap right">'.price($obj->amount).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'totalttcfield';
+		$totalarray['val']['totalttcfield'] += $obj->amount;
+	}
+
+	// Status
+	if (!empty($arrayfields['cs.paye']['checked'])) {
+		print '<td class="nowrap right">'.$chargesociale_static->LibStatut($obj->paye, 5, $obj->alreadypayed).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>';
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print '</table>';
+print '</div>';
+print '</form>';
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index fbecc1df335..78ae1ff3592 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -56,6 +56,8 @@ $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
 	$subcat = true;
 }
+$categorie = new Categorie($db);
+
 // product/service
 $selected_type = GETPOST('search_type', 'int');
 if ($selected_type == '') $selected_type = -1;
@@ -227,11 +229,9 @@ if ($modecompta == 'CREANCES-DETTES')
     if ($selected_soc > 0) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as soc ON (soc.rowid = f.fk_soc)";
     $sql .= ",".MAIN_DB_PREFIX."facturedet as l";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON l.fk_product = p.rowid";
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product";
-	} elseif ($selected_cat) 	// Into a specific category
-	{
+	} elseif ($selected_cat) { 	// Into a specific category
 		$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_product as cp";
 	}
 	$sql .= " WHERE l.fk_facture = f.rowid";
@@ -249,14 +249,25 @@ if ($modecompta == 'CREANCES-DETTES')
 	{
 		$sql .= " AND l.product_type = ".$selected_type;
 	}
-	if ($selected_cat === -2)	// Without any category
-	{
+	if ($selected_cat === -2) {	// Without any category
 		$sql .= " AND cp.fk_product is null";
 	} elseif ($selected_cat) {	// Into a specific category
-		$sql .= " AND (c.rowid = ".$selected_cat;
-		if ($subcat) $sql .= " OR c.fk_parent = ".$selected_cat;
-		$sql .= ")";
-		$sql .= " AND cp.fk_categorie = c.rowid AND cp.fk_product = p.rowid";
+        if ($subcat) {
+            $TListOfCats = $categorie->get_full_arbo('product', $selected_cat, 1);
+
+            $listofcatsql = "";
+            foreach ($TListOfCats as $key => $cat)
+            {
+                if ($key !== 0) $listofcatsql .= ",";
+                $listofcatsql .= $cat['rowid'];
+            }
+        }
+
+        $sql.= " AND (p.rowid IN ";
+        $sql .= " (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product cp WHERE ";
+        if ($subcat) $sql .= "cp.fk_categorie IN (". $listofcatsql.")";
+        else $sql.="cp.fk_categorie = ".$selected_cat;
+        $sql.= "))";
 	}
     if ($selected_soc > 0) $sql .= " AND soc.rowid=".$selected_soc;
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 010fd112646..a39e14466eb 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -98,7 +98,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
 	}
     $object->amount = $amount;
 	$object->label = GETPOST("label", 'alpha');
-	$object->note = GETPOST("note", 'restricthtml');
+	$object->note_private = GETPOST("note", 'restricthtml');
 
 	if (empty($object->datep))
 	{
@@ -239,7 +239,7 @@ if ($action == 'create')
     print '<label for="radiorefund">';
     print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
     print '&nbsp;';
-    print $langs->trans("Refund");
+    print $langs->trans("PaymentBack");
     print '</label>';
     print '</div>';
     print "<br>\n";
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index 82829fca12e..554143e7a7e 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+/* Copyright (C) 2001-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2019	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,12 +20,18 @@
  */
 
 /**
- *	    \file       htdocs/compta/tva/list.php
- *      \ingroup    tax
- *		\brief      List of VAT payments
+ *	\file		htdocs/compta/tva/list.php
+ *	\ingroup	tax
+ *	\brief		List of VAT payments
  */
 
 require '../../main.inc.php';
+
+// Security check
+$socid = GETPOST('socid', 'int');
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'tax', '', '', 'charges');
+
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/tva.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -34,61 +41,79 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'bills'));
 
-// Security check
-$socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
-$result = restrictedArea($user, 'tax', '', '', 'charges');
+$action						= GETPOST('action', 'alpha');
+$massaction					= GETPOST('massaction', 'alpha');
+$confirm					= GETPOST('confirm', 'alpha');
+$optioncss					= GETPOST('optioncss', 'alpha');
+$contextpage				= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'salestaxeslist';
 
-$search_ref = GETPOST('search_ref', 'int');
-$search_label = GETPOST('search_label', 'alpha');
-$search_account = GETPOST('search_account', 'int');
-$search_dateend_start = dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int'));
-$search_dateend_end = dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int'));
-$search_datepayment_start = dol_mktime(0, 0, 0, GETPOST('search_datepayment_startmonth', 'int'), GETPOST('search_datepayment_startday', 'int'), GETPOST('search_datepayment_startyear', 'int'));
-$search_datepayment_end = dol_mktime(23, 59, 59, GETPOST('search_datepayment_endmonth', 'int'), GETPOST('search_datepayment_endday', 'int'), GETPOST('search_datepayment_endyear', 'int'));
-$search_amount = GETPOST('search_amount', 'alpha');
-$month = GETPOST("month", "int");
-$year = GETPOST("year", "int");
+$search_ref					= GETPOST('search_ref', 'alpha');
+$search_label				= GETPOST('search_label', 'alpha');
+$search_dateend_start		= dol_mktime(0, 0, 0, GETPOST('search_dateend_startmonth', 'int'), GETPOST('search_dateend_startday', 'int'), GETPOST('search_dateend_startyear', 'int'));
+$search_dateend_end			= dol_mktime(23, 59, 59, GETPOST('search_dateend_endmonth', 'int'), GETPOST('search_dateend_endday', 'int'), GETPOST('search_dateend_endyear', 'int'));
+$search_datepayment_start	= dol_mktime(0, 0, 0, GETPOST('search_datepayment_startmonth', 'int'), GETPOST('search_datepayment_startday', 'int'), GETPOST('search_datepayment_startyear', 'int'));
+$search_datepayment_end		= dol_mktime(23, 59, 59, GETPOST('search_datepayment_endmonth', 'int'), GETPOST('search_datepayment_endday', 'int'), GETPOST('search_datepayment_endyear', 'int'));
+$search_type				= GETPOST('search_type', 'int');
+$search_cheque				= GETPOST('search_cheque', 'alpha');
+$search_account				= GETPOST('search_account', 'int');
+$search_amount 				= GETPOST('search_amount', 'alpha');
 
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST("sortfield", 'alpha');
-$sortorder = GETPOST("sortorder", 'alpha');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$limit						= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield					= GETPOST('sortfield', 'alpha');
+$sortorder					= GETPOST('sortorder', 'alpha');
+$page						= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+
+if (empty($page) || $page == -1) $page = 0;		// If $page is not defined, or '' or -1
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (!$sortfield) $sortfield = "t.datev";
-if (!$sortorder) $sortorder = "DESC";
 
-$filtre = $_GET["filtre"];
+if (!$sortfield) $sortfield = 't.datev';
+if (!$sortorder) $sortorder = 'DESC';
 
-if (empty($_REQUEST['typeid']))
-{
-	$newfiltre = str_replace('filtre=', '', $filtre);
-	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val)
+$arrayfields = array(
+	't.rowid'			=>array('checked'=>1, 'position'=>10, 'label'=>"Ref",),
+	't.label'			=>array('checked'=>1, 'position'=>20, 'label'=>"Label"),
+	't.datev'			=>array('checked'=>1, 'position'=>30, 'label'=>"PeriodEndDate"),
+	't.datep'			=>array('checked'=>1, 'position'=>40, 'label'=>"DatePayment"),
+	't.fk_typepayment'	=>array('checked'=>1, 'position'=>50, 'label'=>"Type"),
+	't.num_payment'		=>array('checked'=>1, 'position'=>60, 'label'=>"Numero", 'tooltip'=>"ChequeOrTransferNumber"),
+	'transaction'		=>array('checked'=>1, 'position'=>70, 'label'=>"BankTransactionLine", 'enabled'=>(!empty($conf->banque->enabled))),
+	'ba.label'			=>array('checked'=>1, 'position'=>80, 'label'=>"Account", 'enable'=>(!empty($conf->banque->enabled))),
+	't.amount'			=>array('checked'=>1, 'position'=>90, 'label'=>"PayedByThisPayment"),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('salestaxeslist'));
+$object = new Tva($db);
+
+
+/*
+ * Actions
+ */
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
 	{
-		$part = explode(':', $val);
-		if ($part[0] == 't.fk_typepayment') $typeid = $part[1];
+		$search_ref = '';
+		$search_label = '';
+		$search_dateend_start = '';
+		$search_dateend_end = '';
+		$search_datepayment_start = '';
+		$search_datepayment_end = '';
+		$search_type = '';
+		$search_cheque = '';
+		$search_account = '';
+		$search_amount = '';
 	}
-} else {
-	$typeid = $_REQUEST['typeid'];
-}
-
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-{
-	$search_ref = "";
-	$search_label = "";
-	$search_dateend_start = '';
-	$search_dateend_end = '';
-	$search_datepayment_start = '';
-	$search_datepayment_end = '';
-	$search_account = '';
-	$search_amount = "";
-	$year = "";
-	$month = "";
-    $typeid = "";
 }
 
 
@@ -96,194 +121,325 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
  * View
  */
 
-llxHeader('', $langs->trans("VATPayments"));
-
 $form = new Form($db);
 $formother = new FormOther($db);
 $tva_static = new Tva($db);
 $bankstatic = new Account($db);
+$accountingjournal = new AccountingJournal($db);
+$bankline = new AccountLine($db);
+
+llxHeader('', $langs->trans("VATPayments"));
+
+$sql = 'SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.fk_typepayment as type, t.num_payment, t.fk_bank';
+$sql .= ', ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel';
+$sql .= ', pst.code as payment_code';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'tva as t';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pst ON t.fk_typepayment = pst.id';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON t.fk_bank = b.rowid';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+$sql .= ' WHERE t.entity IN ('.getEntity($object->element).')';
+
+if (!empty($search_ref))							$sql .= natural_search('t.rowid', $search_ref);
+if (!empty($search_label))							$sql .= natural_search('t.label', $search_label);
+if (!empty($search_dateend_start))					$sql .= ' AND t.datev >= "'.$db->idate($search_dateend_start).'"';
+if (!empty($search_dateend_end))					$sql .= ' AND t.datev <= "'.$db->idate($search_dateend_end).'"';
+if (!empty($search_datepayment_start))  			$sql .= ' AND t.datep >= "'.$db->idate($search_datepayment_start).'"';
+if (!empty($search_datepayment_end))				$sql .= ' AND t.datep <= "'.$db->idate($search_datepayment_end).'"';
+if (!empty($search_type) && $search_type > 0)		$sql .= ' AND t.fk_typepayment='.$search_type;
+if (!empty($search_cheque))							$sql .= natural_search('t.num_payment', $search_cheque);
+if (!empty($search_account) && $search_account > 0)	$sql .= ' AND b.fk_account='.$search_account;
+if (!empty($search_amount))							$sql .= natural_search('t.amount', price2num(trim($search_amount)), 1);
 
-$sql = "SELECT t.rowid, t.amount, t.label, t.datev, t.datep, t.fk_typepayment as type, t.num_payment, t.fk_bank, pst.code as payment_code,";
-$sql .= " ba.rowid as bid, ba.ref as bref, ba.number as bnumber, ba.account_number, ba.fk_accountancy_journal, ba.label as blabel";
-$sql .= " FROM ".MAIN_DB_PREFIX."tva as t";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pst ON t.fk_typepayment = pst.id";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON t.fk_bank = b.rowid";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
-$sql .= " WHERE t.entity IN (".getEntity('tax').")";
-if ($search_ref)				$sql .= natural_search("t.rowid", $search_ref);
-if ($search_label)				$sql .= natural_search("t.label", $search_label);
-if ($search_account > 0)		$sql .= " AND b.fk_account=".$search_account;
-if ($search_amount)				$sql .= natural_search("t.amount", price2num(trim($search_amount)), 1);
-if ($search_dateend_start)		$sql .= " AND t.datev >= '".$db->idate($search_dateend_start)."'";
-if ($search_dateend_end)		$sql .= " AND t.datev <= '".$db->idate($search_dateend_end)."'";
-if ($search_datepayment_start)  $sql .= " AND t.datep >= '".$db->idate($search_datepayment_start)."'";
-if ($search_datepayment_end)	$sql .= " AND t.datep <= '".$db->idate($search_datepayment_end)."'";
-if ($filtre) {
-    $filtre = str_replace(":", "=", $filtre);
-    $sql .= " AND ".$filtre;
-}
-if ($typeid) {
-    $sql .= " AND t.fk_typepayment=".$typeid;
-}
 $sql .= $db->order($sortfield, $sortorder);
-$totalnboflines = 0;
-$result = $db->query($sql);
-if ($result)
-{
-    $totalnboflines = $db->num_rows($result);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+
+	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {
+		$page = 0;
+		$offset = 0;
+	}
 }
+
 $sql .= $db->plimit($limit + 1, $offset);
 
 $result = $db->query($sql);
-if ($result)
+if (!$result)
 {
-    $num = $db->num_rows($result);
-    $i = 0;
-    $total = 0;
-
-	$param = '';
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
-	if ($typeid) $param .= '&amp;typeid='.$typeid;
-
-	$url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
-	if (!empty($socid)) $url .= '&socid='.$socid;
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-	print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
-
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-	print '<tr class="liste_titre_filter">';
-	// Ref
-	print '<td class="liste_titre"><input type="text" class="flat" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'"></td>';
-	// Label
-	print '<td class="liste_titre"><input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
-	// Date end period
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-	print '</div>';
-	// Date payment
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
-	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
-	print '</div>';
-	// Type
-	print '<td class="liste_titre left">';
-	$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16);
-	print '</td>';
-	// Account
-	if (!empty($conf->banque->enabled))
-    {
-	    print '<td class="liste_titre">';
-	    $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	    print '</td>';
-    }
-	// Amount
-	print '<td class="liste_titre right"><input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'"></td>';
-    print '<td class="liste_titre maxwidthsearch">';
-    $searchpicto = $form->showFilterAndCheckAddButtons(0);
-    print $searchpicto;
-    print '</td>';
-	print "</tr>\n";
-
-	print '<tr class="liste_titre">';
-	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "t.rowid", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "t.label", "", $param, 'align="left"', $sortfield, $sortorder);
-	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "t.datev", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "t.datep", "", $param, 'align="center"', $sortfield, $sortorder);
-	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "type", "", $param, '', $sortfield, $sortorder, 'left ');
-	if (!empty($conf->banque->enabled)) print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "ba.label", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("PayedByThisPayment", $_SERVER["PHP_SELF"], "t.amount", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-	print "</tr>\n";
-
-	while ($i < min($num, $limit))
-    {
-        $obj = $db->fetch_object($result);
-
-		if ($obj->payment_code <> '')
-		{
-			$type = '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).' '.$obj->num_payment.'</td>';
-		} else {
-			$type = '<td>&nbsp;</td>';
-		}
-
-        print '<tr class="oddeven">';
-
-		$tva_static->id = $obj->rowid;
-		$tva_static->ref = $obj->rowid;
-
-		// Ref
-		print "<td>".$tva_static->getNomUrl(1)."</td>\n";
-        // Label
-		print "<td>".dol_trunc($obj->label, 40)."</td>\n";
-		// Date end period
-        print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day')."</td>\n";
-        // Date payment
-        print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
-        // Type
-		print $type;
-		// Account
-    	if (!empty($conf->banque->enabled))
-	    {
-	        print '<td>';
-	        if ($obj->fk_bank > 0)
-			{
-				$bankstatic->id = $obj->bid;
-				$bankstatic->ref = $obj->bref;
-				$bankstatic->number = $obj->bnumber;
-				$bankstatic->account_number = $obj->account_number;
-
-				$accountingjournal = new AccountingJournal($db);
-				$accountingjournal->fetch($obj->fk_accountancy_journal);
-				$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
-
-				$bankstatic->label = $obj->blabel;
-				print $bankstatic->getNomUrl(1);
-			} else print '&nbsp;';
-			print '</td>';
-		}
-		// Amount
-        $total = $total + $obj->amount;
-		print '<td class="nowrap right">'.price($obj->amount)."</td>";
-	    print "<td>&nbsp;</td>";
-        print "</tr>\n";
-
-        $i++;
-    }
-
-    $colspan = 5;
-    if (!empty($conf->banque->enabled)) $colspan++;
-    print '<tr class="liste_total"><td colspan="'.$colspan.'">'.$langs->trans("Total").'</td>';
-    print '<td class="right">'.price($total).'</td>';
-	print "<td>&nbsp;</td></tr>";
-
-    print "</table>";
-    print '</div>';
-
-	print '</form>';
-
-    $db->free($result);
-} else {
-    dol_print_error($db);
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
 }
 
+$num = $db->num_rows($result);
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) $param .= '&contextpage='.$contextpage;
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+if ($optioncss != '') $param .= '&optioncss='.urlencode($optioncss);
+
+if (!empty($search_ref))							$param .= '&search_ref="'.$search_ref.'"';
+if (!empty($search_label))							$param .= '&search_label="'.$search_label.'"';
+if (!empty($search_dateend_start))					$param .= '&search_dateend_startyear='.GETPOST('search_dateend_startyear', 'int');
+if (!empty($search_dateend_start))					$param .= '&search_dateend_startmonth='.GETPOST('search_dateend_startmonth', 'int');
+if (!empty($search_dateend_start))					$param .= '&search_dateend_startday='.GETPOST('search_dateend_startday', 'int');
+if (!empty($search_dateend_end))					$param .= '&search_dateend_endyear='.GETPOST('search_dateend_endyear', 'int');
+if (!empty($search_dateend_end))					$param .= '&search_dateend_endmonth='.GETPOST('search_dateend_endmonth', 'int');
+if (!empty($search_dateend_end))					$param .= '&search_dateend_endday='.GETPOST('search_dateend_endday', 'int');
+if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startyear='.GETPOST('search_datepayment_startyear', 'int');
+if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startmonth='.GETPOST('search_datepayment_startmonth', 'int');
+if (!empty($search_datepayment_start))				$param .= '&search_datepayment_startday='.GETPOST('search_datepayment_startday', 'int');
+if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endyear='.GETPOST('search_datepayment_endyear', 'int');
+if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endmonth='.GETPOST('search_datepayment_endmonth', 'int');
+if (!empty($search_datepayment_end))				$param .= '&search_datepayment_endday='.GETPOST('search_datepayment_endday', 'int');
+if (!empty($search_type) && $search_type > 0)		$param .= '&search_type='.$search_type;
+if (!empty($search_cheque))							$param .= '&search_cheque="'.$search_cheque.'"';
+if (!empty($search_account) && $search_account > 0)	$param .= '&search_account='.$search_account;
+if (!empty($search_amount))							$param .= '&search_amount="'.$search_amount.'"';
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$url = DOL_URL_ROOT.'/compta/tva/card.php?action=create';
+if (!empty($socid)) $url .= '&socid='.$socid;
+$newcardbutton = dolGetButtonTitle($langs->trans('NewVATPayment', ($ltt + 1)), '', 'fa fa-plus-circle', $url, '', $user->rights->tax->charges->creer);
+print_barre_liste($langs->trans("VATPayments"), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+$varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+
+print '<tr class="liste_titre_filter">';
+
+// Filters: Lines (placeholder)
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Ref
+if (!empty($arrayfields['t.rowid']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Label
+if (!empty($arrayfields['t.label']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" size="10" name="search_label" value="'.dol_escape_htmltag($search_label).'">';
+	print '</td>';
+}
+
+// Filter: Date end period
+if (!empty($arrayfields['t.datev']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_dateend_start ? $search_dateend_start : -1, 'search_dateend_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_dateend_end ? $search_dateend_end : -1, 'search_dateend_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
+
+// Filter: Date payment
+if (!empty($arrayfields['t.datep']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datepayment_start ? $search_datepayment_start : -1, 'search_datepayment_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="nowrap">';
+	print $form->selectDate($search_datepayment_end ? $search_datepayment_end : -1, 'search_datepayment_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['t.fk_typepayment']['checked'])) {
+	print '<td class="liste_titre left">';
+	$form->select_types_paiements($search_type, 'search_type', '', 0, 1, 1, 16);
+	print '</td>';
+}
+
+// Filter: Cheque number
+if (!empty($arrayfields['t.num_payment']['checked'])) {
+	print '<td class="liste_titre left">';
+	print '<input name="search_cheque" class="flat" type="text" size="8" value="'.$search_cheque.'">';
+	print '</td>';
+}
+
+// Filter: Bank transaction number (placeholder)
+if (!empty($arrayfields['transaction']['checked'])) {
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_account, 'search_account', 0, '', 1);
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['t.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input name="search_amount" class="flat" type="text" size="8" value="'.$search_amount.'">';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Filter: Buttons
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print '</tr>';
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['t.rowid']['checked']))				print_liste_field_titre($arrayfields['t.rowid']['label'], $_SERVER['PHP_SELF'], 't.rowid', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['t.label']['checked']))				print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER['PHP_SELF'], 't.label', '', $param, 'align="left"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.datev']['checked']))				print_liste_field_titre($arrayfields['t.datev']['label'], $_SERVER['PHP_SELF'], 't.datev', '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.datep']['checked']))				print_liste_field_titre($arrayfields['t.datep']['label'], $_SERVER['PHP_SELF'], 't.datep', '', $param, 'align="center"', $sortfield, $sortorder);
+if (!empty($arrayfields['t.fk_typepayment']['checked']))	print_liste_field_titre($arrayfields['t.fk_typepayment']['label'], $_SERVER['PHP_SELF'], 't.fk_typepayment', '', $param, '', $sortfield, $sortorder, 'left ');
+if (!empty($arrayfields['t.num_payment']['checked']))		print_liste_field_titre($arrayfields['t.num_payment']['label'], $_SERVER['PHP_SELF'], 't.num_payment', '', $param, '', $sortfield, $sortorder, '', $arrayfields['t.num_payment']['tooltip']);
+if (!empty($arrayfields['transaction']['checked']))			print_liste_field_titre($arrayfields['transaction']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER['PHP_SELF'], 'ba.label', '', $param, '', $sortfield, $sortorder, 'left ');
+if (!empty($arrayfields['t.amount']['checked']))			print_liste_field_titre($arrayfields['t.amount']['label'], $_SERVER['PHP_SELF'], 't.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+
+// Hook fields
+$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'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print '</tr>';
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$obj = $db->fetch_object($result);
+
+	$tva_static->id = $obj->rowid;
+	$tva_static->ref = $obj->rowid;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['t.rowid']['checked'])) {
+		print '<td>'.$tva_static->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Label
+	if (!empty($arrayfields['t.label']['checked']))	{
+		print '<td>'.dol_trunc($obj->label, 40).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date end period
+	if (!empty($arrayfields['t.datev']['checked']))	{
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datev), 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date payment
+	if (!empty($arrayfields['t.datep']['checked'])) {
+		print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Type
+	if (!empty($arrayfields['t.fk_typepayment']['checked']))
+	{
+		print '<td>'.$langs->trans("PaymentTypeShort".$obj->payment_code).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Cheque number
+	if (!empty($arrayfields['t.num_payment']['checked'])) {
+		print '<td>'.$obj->num_payment.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Bank transaction
+	if (!empty($arrayfields['transaction']['checked'])) {
+		$bankline->fetch($obj->fk_bank);
+		print '<td>'.$bankline->getNomUrl(1, 0).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Account
+	if (!empty($arrayfields['ba.label']['checked'])) {
+		print '<td>';
+		if ($obj->fk_bank > 0) {
+			$bankstatic->id = $obj->bid;
+			$bankstatic->ref = $obj->bref;
+			$bankstatic->number = $obj->bnumber;
+			$bankstatic->account_number = $obj->account_number;
+
+			$accountingjournal->fetch($obj->fk_accountancy_journal);
+			$bankstatic->accountancy_journal = $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+
+			$bankstatic->label = $obj->blabel;
+			print $bankstatic->getNomUrl(1);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	$total = $total + $obj->amount;
+	print '<td class="nowrap right">'.price($obj->amount).'</td>';
+	if (!$i) $totalarray['nbfield']++;
+	$totalarray['pos'][$totalarray['nbfield']] = 'amount';
+	$totalarray['val']['amount'] += $objp->amount;
+
+	// Buttons
+	print '<td></td>';
+
+	print '</tr>';
+
+	$i++;
+}
+
+// Add a buttons placeholder for the total line
+$totalarray['nbfield']++;
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print '</table>';
+print '</div>';
+print '</form>';
+
+$db->free($result);
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 8ea6ebea0d4..91a32f39f26 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -879,7 +879,7 @@ class Contact extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON c.rowid = u.fk_socpeople";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON c.fk_soc = s.rowid";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_stcommcontact as st ON c.fk_stcommcontact = st.id';
-		if ($id) $sql .= " WHERE c.rowid = ".$id;
+		if ($id) $sql .= " WHERE c.rowid = ".((int) $id);
 		else {
 			$sql .= " WHERE c.entity IN (".getEntity($this->element).")";
 			if ($ref_ext) {
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 531fb885f63..4d30977bf6a 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -165,7 +165,7 @@ foreach ($object->fields as $key => $val)
 }
 
 // Add none object fields for "search in all"
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))	{
+if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$fieldstosearchall['s.nom'] = "ThirdParty";
 }
 
@@ -186,7 +186,7 @@ foreach ($object->fields as $key => $val) {
 
 // Add none object fields to fields for list
 $arrayfields['country.code_iso'] = array('label'=>"Country", 'position'=>22, 'checked'=>0);
-if (empty($conf->global->SOCIETE_DISABLE_CONTACTS))	{
+if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
 	$arrayfields['s.nom'] = array('label'=>"ThirdParty", 'position'=>25, 'checked'=>1);
 }
 
@@ -571,7 +571,7 @@ if ($search_firstlast_only)
 }
 
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
@@ -594,21 +594,20 @@ if (!empty($conf->categorie->enabled))
 		$moreforfilter .= $formother->select_categories(Categorie::TYPE_SUPPLIER, $search_categ_supplier, 'search_categ_supplier', 1);
 		$moreforfilter .= '</div>';
 	}
-	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('Roles').': ';
-	$moreforfilter .= $formcompany->showRoles("search_roles", $objecttmp, 'edit', $search_roles);
-	$moreforfilter .= '</div>';
-}
-if ($moreforfilter)
-{
-	print '<div class="liste_titre liste_titre_bydiv centpercent">';
-	print $moreforfilter;
-	$parameters = array('type'=>$type);
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	print '</div>';
 }
 
+$moreforfilter .= '<div class="divsearchfield">';
+$moreforfilter .= $langs->trans('Roles').': ';
+$moreforfilter .= $formcompany->showRoles("search_roles", $objecttmp, 'edit', $search_roles);
+$moreforfilter .= '</div>';
+
+print '<div class="liste_titre liste_titre_bydiv centpercent">';
+print $moreforfilter;
+$parameters = array('type'=>$type);
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+print '</div>';
+
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index dd06d9fed4b..b6e77e69dca 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2014-2018	Ferran Marcet		  	<fmarcet@2byte.es>
  * Copyright (C) 2014-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1192,7 +1192,7 @@ if ($action == 'create')
 
 	// Other attributes
 	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'edit', $parameters);
+		print $object->showOptionals($extrafields, 'create', $parameters);
 	}
 
 	print "</table>\n";
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index e179bd50797..f25d0ba69ef 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -804,7 +804,7 @@ class Contrat extends CommonObject
         $pos = 0;
 
 		// Selects contract lines related to a product
-		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref,";
+		$sql = "SELECT p.label as product_label, p.description as product_desc, p.ref as product_ref, p.fk_product_type as product_type,";
 		$sql .= " d.rowid, d.fk_contrat, d.statut, d.description, d.price_ht, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.remise_percent, d.subprice, d.fk_product_fournisseur_price as fk_fournprice, d.buy_price_ht as pa_ht,";
 		$sql .= " d.total_ht,";
 		$sql .= " d.total_tva,";
@@ -817,7 +817,8 @@ class Contrat extends CommonObject
 		$sql .= " d.fk_user_author,";
 		$sql .= " d.fk_user_ouverture,";
 		$sql .= " d.fk_user_cloture,";
-		$sql .= " d.fk_unit";
+		$sql .= " d.fk_unit,";
+		$sql .= " d.product_type as type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as d LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
 		$sql .= " WHERE d.fk_contrat = ".$this->id;
 		$sql .= " ORDER by d.rowid ASC";
@@ -857,6 +858,7 @@ class Contrat extends CommonObject
 				$line->total_ttc		= $objp->total_ttc;
 				$line->fk_product = (($objp->fk_product > 0) ? $objp->fk_product : 0);
 				$line->info_bits		= $objp->info_bits;
+				$line->type				= $objp->type;
 
 				$line->fk_fournprice = $objp->fk_fournprice;
 				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
@@ -869,7 +871,8 @@ class Contrat extends CommonObject
 
 				$line->ref = $objp->product_ref; // deprecated
 				$line->product_ref = $objp->product_ref; // Product Ref
-				$line->product_desc		= $objp->product_desc; // Product Description
+				$line->product_type		= $objp->product_type;  // Product Type
+				$line->product_desc		= $objp->product_desc;  // Product Description
 				$line->product_label	= $objp->product_label; // Product Label
 
 				$line->description = $objp->description;
@@ -2028,7 +2031,7 @@ class Contrat extends CommonObject
 		$sql .= " c.tms as date_modification,";
 		$sql .= " fk_user_author";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
-		$sql .= " WHERE c.rowid = ".$id;
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -2604,6 +2607,7 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public $description;
 
+	public $product_type;			// 0 for product, 1 for service
 	public $product_ref;
 	public $product_label;
 
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 608fc6c0d81..04329a63145 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -416,7 +416,7 @@ if ($user->rights->user->user->lire)
  	$moreforfilter .= '</div>';
 }
 // If the user can view categories of products
-if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index cee75415eee..219d35e46fb 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -74,7 +74,7 @@ if ($action == 'add' && !empty($permissiontoadd))
 		} elseif (preg_match('/^(integer|price|real|double)/', $object->fields[$key]['type'])) {
 			$value = price2num(GETPOST($key, 'alphanohtml')); // To fix decimal separator according to lang setup
 		} elseif ($object->fields[$key]['type'] == 'boolean') {
-			$value = (GETPOST($key) == 'on' ? 1 : 0);
+			$value = ((GETPOST($key) == '1' || GETPOST($key) == 'on') ? 1 : 0);
 		} else {
 			$value = GETPOST($key, 'alphanohtml');
 		}
diff --git a/htdocs/core/actions_linkedfiles.inc.php b/htdocs/core/actions_linkedfiles.inc.php
index 3caeeed6678..75633c75585 100644
--- a/htdocs/core/actions_linkedfiles.inc.php
+++ b/htdocs/core/actions_linkedfiles.inc.php
@@ -56,10 +56,10 @@ if (GETPOST('sendit', 'alpha') && !empty($conf->global->MAIN_UPLOAD_DOC))
 
 			if (!empty($upload_dirold) && !empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))
 			{
-				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
+				$result = dol_add_file_process($upload_dirold, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object);
 			} elseif (!empty($upload_dir))
 			{
-				$result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs);
+				$result = dol_add_file_process($upload_dir, $allowoverwrite, 1, 'userfile', GETPOST('savingdocmask', 'alpha'), null, '', $generatethumbs, $object);
 			}
 		}
 	}
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 5be25002079..196656b983f 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -321,7 +321,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 
 			if ($action == 'send' || $action == 'relance')
 			{
-				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('To').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
+				$actionmsg2 = $langs->transnoentities('MailSentBy').' '.CMailFile::getValidAddress($from, 4, 0, 1).' '.$langs->transnoentities('at').' '.CMailFile::getValidAddress($sendto, 4, 0, 1);
 				if ($message)
 				{
 					$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index 61db9b9fc55..f8d54f2b40b 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -33,7 +33,7 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
 	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
 
-	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'restricthtml'), ENT_QUOTES, 'UTF-8', 1), '_public');
+	$result_update = $object->update_note(dol_html_entity_decode(GETPOST('note_public', 'restricthtml'), ENT_QUOTES|ENT_HTML5, 'UTF-8', 1), '_public');
 
 	if ($result_update < 0) setEventMessages($object->error, $object->errors, 'errors');
 	elseif (in_array($object->table_element, array('supplier_proposal', 'propal', 'commande_fournisseur', 'commande', 'facture_fourn', 'facture')))
@@ -63,6 +63,6 @@ if ($action == 'setnote_public' && !empty($permissionnote) && !GETPOST('cancel',
 	// Set public note
 	if (empty($action) || !is_object($object) || empty($id)) dol_print_error('', 'Include of actions_setnotes.inc.php was done but required variable was not set before');
 	if (empty($object->id)) $object->fetch($id); // Fetch may not be already done
-	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES), '_private');
+	$result = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES|ENT_HTML5), '_private');
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
 }
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index 29aeb9cc7eb..87b3a903343 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -119,6 +119,28 @@ if ((! empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFOR
 	$arrayresult['searchintosupplierinvoice'] = array('position'=>120, 'img'=>'object_bill', 'label'=>$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'text'=>img_picto('', 'object_supplier_invoice').' '.$langs->trans("SearchIntoSupplierInvoices", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/fourn/facture/list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
+// Customer payments
+if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire)
+{
+	$arrayresult['searchintocustomerpayments'] = array(
+		'position'=>170,
+		'img'=>'object_payment',
+		'label'=>$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoCustomerPayments", $search_boxvalue),
+		'url'=>DOL_URL_ROOT.'/compta/paiement/list.php?leftmenu=customers_bills_payment'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+}
+
+// Vendor payments
+if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED) || ! empty($conf->supplier_invoice->enabled)) && $user->rights->fournisseur->facture->lire)
+{
+	$arrayresult['searchintovendorpayments'] = array(
+		'position'=>175,
+		'img'=>'object_payment',
+		'label'=>$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'text'=>img_picto('', 'object_payment').' '.$langs->trans("SearchIntoVendorPayments", $search_boxvalue),
+		'url'=>DOL_URL_ROOT.'/fourn/paiement/list.php?leftmenu=suppliers_bills_payment'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
+}
+
 // Miscellaneous payments
 if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED) && $user->rights->banque->lire)
 {
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 0546f907b64..1585241b843 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -30,413 +30,413 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
  */
 class box_activity extends ModeleBoxes
 {
-    public $boxcode = "activity";
-    public $boximg = "object_bill";
-    public $boxlabel = 'BoxGlobalActivity';
-    public $depends = array("facture");
+	public $boxcode = "activity";
+	public $boximg = "object_bill";
+	public $boxlabel = 'BoxGlobalActivity';
+	public $depends = array("facture");
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    public $param;
-    public $enabled = 1;
+	public $param;
+	public $enabled = 1;
 
-    public $info_box_head = array();
-    public $info_box_contents = array();
+	public $info_box_head = array();
+	public $info_box_contents = array();
 
 
-    /**
-     *  Constructor
-     *
-     *  @param  DoliDB  $db         Database handler
-     *  @param  string  $param      More parameters
-     */
-    public function __construct($db, $param)
-    {
-        global $conf, $user;
+	/**
+	 *  Constructor
+	 *
+	 *  @param  DoliDB  $db         Database handler
+	 *  @param  string  $param      More parameters
+	 */
+	public function __construct($db, $param)
+	{
+		global $conf, $user;
 
-        $this->db = $db;
+		$this->db = $db;
 
-        // FIXME: Pb into some status
-        $this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
+		// FIXME: Pb into some status
+		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
 
-        $this->hidden = !((!empty($conf->facture->enabled) && $user->rights->facture->lire)
-            || (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-            || (!empty($conf->propal->enabled) && $user->rights->propale->lire)
-            );
-    }
+		$this->hidden = !((!empty($conf->facture->enabled) && $user->rights->facture->lire)
+			|| (!empty($conf->commande->enabled) && $user->rights->commande->lire)
+			|| (!empty($conf->propal->enabled) && $user->rights->propale->lire)
+			);
+	}
 
-    /**
-     *  Charge les donnees en memoire pour affichage ulterieur
-     *
-     *  @param  int     $max        Maximum number of records to load
-     *  @return void
-     */
-    public function loadBox($max = 5)
-    {
-        global $conf, $user, $langs;
+	/**
+	 *  Charge les donnees en memoire pour affichage ulterieur
+	 *
+	 *  @param  int     $max        Maximum number of records to load
+	 *  @return void
+	 */
+	public function loadBox($max = 5)
+	{
+		global $conf, $user, $langs;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        $totalnb = 0;
-        $line = 0;
-        $cachetime = 3600;
-        $fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'-r'.($user->rights->societe->client->voir ? '1' : '0').'.cache';
-        $now = dol_now();
-        $nbofperiod = 3;
+		$totalnb = 0;
+		$line = 0;
+		$cachetime = 3600;
+		$fileid = '-e'.$conf->entity.'-u'.$user->id.'-s'.$user->socid.'-r'.($user->rights->societe->client->voir ? '1' : '0').'.cache';
+		$now = dol_now();
+		$nbofperiod = 3;
 
-        if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
-        $textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
-        $this->info_box_head = array(
-            'text' => $textHead,
-            'limit'=> dol_strlen($textHead),
-        );
+		if (!empty($conf->global->MAIN_BOX_ACTIVITY_DURATION)) $nbofperiod = $conf->global->MAIN_BOX_ACTIVITY_DURATION;
+		$textHead = $langs->trans("Activity").' - '.$langs->trans("LastXMonthRolling", $nbofperiod);
+		$this->info_box_head = array(
+			'text' => $textHead,
+			'limit'=> dol_strlen($textHead),
+		);
 
-        // compute the year limit to show
-        $tmpdate = dol_time_plus_duree(dol_now(), -1 * $nbofperiod, "m");
+		// compute the year limit to show
+		$tmpdate = dol_time_plus_duree(dol_now(), -1 * $nbofperiod, "m");
 
 
-        // list the summary of the propals
-        if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-        	$propalstatic = new Propal($this->db);
+		// list the summary of the propals
+		if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			$propalstatic = new Propal($this->db);
 
-        	$cachedir = DOL_DATA_ROOT.'/propale/temp';
-        	$filename = '/boxactivity-propal'.$fileid;
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        	$data = array();
-        	if ($refresh)
-        	{
-        		$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql .= ")";
-        		$sql .= " WHERE p.entity IN (".getEntity('propal').")";
-        		$sql .= " AND p.fk_soc = s.rowid";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-        		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-        		$sql .= " AND p.datep >= '".$this->db->idate($tmpdate)."'";
-        		$sql .= " AND p.date_cloture IS NULL"; // just unclosed
-        		$sql .= " GROUP BY p.fk_statut";
-        		$sql .= " ORDER BY p.fk_statut DESC";
+			$cachedir = DOL_DATA_ROOT.'/propale/temp';
+			$filename = '/boxactivity-propal'.$fileid;
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
+			if ($refresh)
+			{
+				$sql = "SELECT p.fk_statut, SUM(p.total) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE p.entity IN (".getEntity('propal').")";
+				$sql .= " AND p.fk_soc = s.rowid";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND p.datep >= '".$this->db->idate($tmpdate)."'";
+				$sql .= " AND p.date_cloture IS NULL"; // just unclosed
+				$sql .= " GROUP BY p.fk_statut";
+				$sql .= " ORDER BY p.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result)
-        		{
-        			$num = $this->db->num_rows($result);
+				$result = $this->db->query($sql);
+				if ($result)
+				{
+					$num = $this->db->num_rows($result);
 
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data))
-        	{
-        		$j = 0;
-        		while ($j < count($data))
-        		{
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
-                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-                        'logo' => 'object_propal'
-        			);
+			if (!empty($data))
+			{
+				$j = 0;
+				while ($j < count($data))
+				{
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
+						'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+						'logo' => 'object_propal'
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
-        			);
-        			$totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans("Proposals")."&nbsp;".$propalstatic->LibStatut($data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=".$data[$j]->fk_statut,
+					);
+					$totalnb += $data[$j]->nb;
 
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-        			);
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
-        			);
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $propalstatic->LibStatut($data[$j]->fk_statut, 3),
+					);
 
-        			$line++;
-        			$j++;
-        		}
-        	}
-        }
+					$line++;
+					$j++;
+				}
+			}
+		}
 
-        // list the summary of the orders
-        if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
-            include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-            $commandestatic = new Commande($this->db);
+		// list the summary of the orders
+		if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+			include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+			$commandestatic = new Commande($this->db);
 
-            $langs->load("orders");
+			$langs->load("orders");
 
-            $cachedir = DOL_DATA_ROOT.'/commande/temp';
-            $filename = '/boxactivity-order'.$fileid;
-            $refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-            $data = array();
+			$cachedir = DOL_DATA_ROOT.'/commande/temp';
+			$filename = '/boxactivity-order'.$fileid;
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
 
-            if ($refresh) {
-                $sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
-                $sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
-                if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-                $sql .= ")";
-        		$sql .= " WHERE c.entity IN (".getEntity('commande').")";
-                $sql .= " AND c.fk_soc = s.rowid";
-                if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-                if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-                $sql .= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
-                $sql .= " GROUP BY c.fk_statut";
-                $sql .= " ORDER BY c.fk_statut DESC";
+			if ($refresh) {
+				$sql = "SELECT c.fk_statut, sum(c.total_ttc) as Mnttot, count(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as c";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE c.entity IN (".getEntity('commande').")";
+				$sql .= " AND c.fk_soc = s.rowid";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND c.date_commande >= '".$this->db->idate($tmpdate)."'";
+				$sql .= " GROUP BY c.fk_statut";
+				$sql .= " ORDER BY c.fk_statut DESC";
 
-                $result = $this->db->query($sql);
-                if ($result) {
-                    $num = $this->db->num_rows($result);
-                    $j = 0;
-                    while ($j < $num) {
-                        $data[$j] = $this->db->fetch_object($result);
-                        $j++;
-                    }
-                    if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-                        dol_filecache($cachedir, $filename, $data);
-                    }
-                    $this->db->free($result);
-                } else {
-                    dol_print_error($this->db);
-                }
-            } else {
-                $data = dol_readcachefile($cachedir, $filename);
-            }
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-            if (!empty($data)) {
-                $j = 0;
-                while ($j < count($data)) {
-                    $this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
-                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                        'logo' => 'object_order',
-                    );
+			if (!empty($data)) {
+				$j = 0;
+				while ($j < count($data)) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
+						'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+						'logo' => 'object_order',
+					);
 
-                    $this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                    );
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' =>$langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+					);
 
-                    $this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
-                        'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
-                    );
-                    $totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans("Orders")."&nbsp;".$commandestatic->LibStatut($data[$j]->fk_statut, 0, 0),
+						'url' => DOL_URL_ROOT."/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=".$data[$j]->fk_statut,
+					);
+					$totalnb += $data[$j]->nb;
 
-                    $this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-                    );
-                    $this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
-                    );
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $commandestatic->LibStatut($data[$j]->fk_statut, 0, 3),
+					);
 
-                    $line++;
-                    $j++;
-                }
-            }
-        }
+					$line++;
+					$j++;
+				}
+			}
+		}
 
 
-        // list the summary of the bills
-        if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
-        {
-        	include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-        	$facturestatic = new Facture($this->db);
+		// list the summary of the bills
+		if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+			$facturestatic = new Facture($this->db);
 
-        	// part 1
-        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
-        	$filename = '/boxactivity-invoice'.$fileid;
+			// part 1
+			$cachedir = DOL_DATA_ROOT.'/facture/temp';
+			$filename = '/boxactivity-invoice'.$fileid;
 
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
-        	$data = array();
-        	if ($refresh)
-        	{
-        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-        		$sql .= ")";
-        		$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-        		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-        		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
-        		$sql .= " AND f.fk_soc = s.rowid";
-        		$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
-        		$sql .= " GROUP BY f.fk_statut";
-        		$sql .= " ORDER BY f.fk_statut DESC";
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$data = array();
+			if ($refresh)
+			{
+				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+				$sql .= ")";
+				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
+				if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+				if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
+				$sql .= " AND f.fk_soc = s.rowid";
+				$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=1";
+				$sql .= " GROUP BY f.fk_statut";
+				$sql .= " ORDER BY f.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result) {
-        			$num = $this->db->num_rows($result);
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data)) {
-        		$j = 0;
-        		while ($j < count($data)) {
-        			$billurl = "search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                        'logo' => 'bill',
-        			);
+			if (!empty($data)) {
+				$j = 0;
+				while ($j < count($data)) {
+					$billurl = "search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'logo' => 'bill',
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
-                        'text' => $data[$j]->nb,
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			);
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
+						'text' => $data[$j]->nb,
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+					);
 
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
-        			);
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency)
+					);
 
-        			// We add only for the current year
-       				$totalnb += $data[$j]->nb;
+					// We add only for the current year
+	   				$totalnb += $data[$j]->nb;
 
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
-        			);
-        			$line++;
-        			$j++;
-        		}
-        		if (count($data) == 0)
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-        			);
-        	}
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut(1, $data[$j]->fk_statut, 3),
+					);
+					$line++;
+					$j++;
+				}
+				if (count($data) == 0)
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
+			}
 
-        	// part 2
-        	$cachedir = DOL_DATA_ROOT.'/facture/temp';
-        	$filename = '/boxactivity-invoice2'.$fileid;
+			// part 2
+			$cachedir = DOL_DATA_ROOT.'/facture/temp';
+			$filename = '/boxactivity-invoice2'.$fileid;
 
-        	$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
+			$refresh = dol_cache_refresh($cachedir, $filename, $cachetime);
 
-        	$data = array();
-        	if ($refresh) {
-        		$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
-        		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
-        		$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
-        		$sql .= " AND f.fk_soc = s.rowid";
-        		$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=0";
-        		$sql .= " GROUP BY f.fk_statut";
-        		$sql .= " ORDER BY f.fk_statut DESC";
+			$data = array();
+			if ($refresh) {
+				$sql = "SELECT f.fk_statut, SUM(f.total_ttc) as Mnttot, COUNT(*) as nb";
+				$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
+				$sql .= " WHERE f.entity IN (".getEntity('invoice').')';
+				$sql .= " AND f.fk_soc = s.rowid";
+				$sql .= " AND f.datef >= '".$this->db->idate($tmpdate)."' AND f.paye=0";
+				$sql .= " GROUP BY f.fk_statut";
+				$sql .= " ORDER BY f.fk_statut DESC";
 
-        		$result = $this->db->query($sql);
-        		if ($result) {
-        			$num = $this->db->num_rows($result);
-        			$j = 0;
-        			while ($j < $num) {
-        				$data[$j] = $this->db->fetch_object($result);
-        				$j++;
-        			}
-        			if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
-        				dol_filecache($cachedir, $filename, $data);
-        			}
-        			$this->db->free($result);
-        		} else {
-        			dol_print_error($this->db);
-        		}
-        	} else {
-        		$data = dol_readcachefile($cachedir, $filename);
-        	}
+				$result = $this->db->query($sql);
+				if ($result) {
+					$num = $this->db->num_rows($result);
+					$j = 0;
+					while ($j < $num) {
+						$data[$j] = $this->db->fetch_object($result);
+						$j++;
+					}
+					if (!empty($conf->global->MAIN_ACTIVATE_FILECACHE)) {
+						dol_filecache($cachedir, $filename, $data);
+					}
+					$this->db->free($result);
+				} else {
+					dol_print_error($this->db);
+				}
+			} else {
+				$data = dol_readcachefile($cachedir, $filename);
+			}
 
-        	if (!empty($data)) {
-        		$alreadypaid = -1;
+			if (!empty($data)) {
+				$alreadypaid = -1;
 
-        		$j = 0;
-        		while ($j < count($data)) {
-        			$billurl = "search_status=".$data[$j]->fk_statut."&amp;paye=0";
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="left" width="16"',
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-                        'logo' => 'bill',
-        			);
+				$j = 0;
+				while ($j < count($data)) {
+					$billurl = "search_status=".$data[$j]->fk_statut."&amp;paye=0";
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="left" width="16"',
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+						'logo' => 'bill',
+					);
 
-        			$this->info_box_contents[$line][1] = array(
-                        'td' => '',
-                        'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-        			);
+					$this->info_box_contents[$line][1] = array(
+						'td' => '',
+						'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+					);
 
-        			$this->info_box_contents[$line][2] = array(
-                        'td' => 'class="right"',
-                        'text' => $data[$j]->nb,
-                        'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
-                        'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
-        			);
-        			$totalnb += $data[$j]->nb;
-        			$this->info_box_contents[$line][3] = array(
-                        'td' => 'class="nowraponall right"',
-                        'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
-        			);
-        			$this->info_box_contents[$line][4] = array(
-                        'td' => 'class="right" width="18"',
-                        'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
-        			);
-        			$line++;
-        			$j++;
-        		}
-        		if (count($data) == 0) {
-        			$this->info_box_contents[$line][0] = array(
-                        'td' => 'class="center"',
-                        'text'=>$langs->trans("NoRecordedInvoices"),
-                    );
-                }
-        	}
-        }
+					$this->info_box_contents[$line][2] = array(
+						'td' => 'class="right"',
+						'text' => $data[$j]->nb,
+						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(0, $data[$j]->fk_statut, 0),
+						'url' => DOL_URL_ROOT."/compta/facture/list.php?".$billurl."&amp;mainmenu=accountancy&amp;leftmenu=customers_bills",
+					);
+					$totalnb += $data[$j]->nb;
+					$this->info_box_contents[$line][3] = array(
+						'td' => 'class="nowraponall right"',
+						'text' => price($data[$j]->Mnttot, 1, $langs, 0, 0, -1, $conf->currency),
+					);
+					$this->info_box_contents[$line][4] = array(
+						'td' => 'class="right" width="18"',
+						'text' => $facturestatic->LibStatut(0, $data[$j]->fk_statut, 3, $alreadypaid),
+					);
+					$line++;
+					$j++;
+				}
+				if (count($data) == 0) {
+					$this->info_box_contents[$line][0] = array(
+						'td' => 'class="center"',
+						'text'=>$langs->trans("NoRecordedInvoices"),
+					);
+				}
+			}
+		}
 
 		// Add the sum in the bottom of the boxes
 		$this->info_box_contents[$line][0] = array('tr' => 'class="liste_total_wrap"');
@@ -444,19 +444,19 @@ class box_activity extends ModeleBoxes
 		$this->info_box_contents[$line][2] = array('td' => 'class="liste_total right" ', 'text' => $totalnb);
 		$this->info_box_contents[$line][3] = array('td' => 'class="liste_total right" ', 'text' => '');
 		$this->info_box_contents[$line][4] = array('td' => 'class="liste_total right" ', 'text' => "");
-    }
+	}
 
 
-    /**
-     *  Method to show box
-     *
-     *  @param	array	$head       Array with properties of box title
-     *  @param  array	$contents   Array with properties of box lines
-     *  @param	int		$nooutput	No print, only return string
-     *  @return	string
-     */
-    public function showBox($head = null, $contents = null, $nooutput = 0)
-    {
-        return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-    }
+	/**
+	 *  Method to show box
+	 *
+	 *  @param	array	$head       Array with properties of box title
+	 *  @param  array	$contents   Array with properties of box lines
+	 *  @param	int		$nooutput	No print, only return string
+	 *  @return	string
+	 */
+	public function showBox($head = null, $contents = null, $nooutput = 0)
+	{
+		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
+	}
 }
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 7ec5071b6e3..90729b96017 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -105,7 +105,7 @@ class box_commandes extends ModeleBoxes
             $sql .= ", ".MAIN_DB_PREFIX."commande as c";
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
+            $sql .= " AND c.entity IN (".getEntity('commande').")";
             if (!empty($conf->global->ORDER_BOX_LAST_ORDERS_VALIDATED_ONLY)) $sql .= " AND c.fk_statut = 1";
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
             if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 979723753a0..331ff54cb8d 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -91,7 +91,7 @@ class box_propales extends ModeleBoxes
     		$sql .= ", ".MAIN_DB_PREFIX."propal as p";
     		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
     		$sql .= " WHERE p.fk_soc = s.rowid";
-    		$sql .= " AND p.entity = ".$conf->entity;
+    		$sql .= " AND p.entity IN (".getEntity('propal').")";
     		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     		if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
             if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY p.datep DESC, p.ref DESC ";
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index d528a4d68ca..f87fbd7b282 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -91,7 +91,7 @@ class box_services_contracts extends ModeleBoxes
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
 			$sql .= " c.rowid, c.ref, c.statut as contract_status, c.ref_customer, c.ref_supplier,";
 			$sql .= " cd.rowid as cdid, cd.label, cd.description, cd.tms as datem, cd.statut as contractline_status, cd.product_type as type, cd.date_fin_validite as date_line,";
-			$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as plabel, p.fk_product_type as ptype, p.entity, p.tobuy, p.tosell";
+			$sql .= " p.rowid as product_id, p.ref as product_ref, p.label as product_label, p.fk_product_type as product_type, p.entity, p.tobuy, p.tosell";
 			$sql .= " FROM (".MAIN_DB_PREFIX."societe as s";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contrat as c ON s.rowid = c.fk_soc";
 			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."contratdet as cd ON c.rowid = cd.fk_contrat";
@@ -125,6 +125,8 @@ class box_services_contracts extends ModeleBoxes
 					$contractlinestatic->type = $objp->type;
 					$contractlinestatic->product_id = $objp->product_id;
 					$contractlinestatic->product_ref = $objp->product_ref;
+					$contratlignestatic->product_type = $objp->product_type;
+
 					$contractlinestatic->statut = $objp->contractline_status;
 
 					$contractstatic->id = $objp->rowid;
@@ -150,27 +152,27 @@ class box_services_contracts extends ModeleBoxes
 					if ($objp->product_id > 0)
 					{
 						$productstatic->id = $objp->product_id;
-						$productstatic->type = $objp->ptype;
+						$productstatic->type = $objp->product_type;
 						$productstatic->ref = $objp->product_ref;
 						$productstatic->entity = $objp->pentity;
-						$productstatic->label = $objp->plabel;
+						$productstatic->label = $objp->product_label;
 						$productstatic->status = $objp->tosell;
 						$productstatic->status_buy = $objp->tobuy;
 
 						$text = $productstatic->getNomUrl(1, '', 20);
-						if ($objp->plabel)
+						if ($objp->product_label)
 						{
 							$text .= ' - ';
 							//$productstatic->ref=$objp->label;
 							//$text .= $productstatic->getNomUrl(0,'',16);
-							$text .= $objp->plabel;
+							$text .= $objp->product_label;
 						}
 						$description = $objp->description;
 
 						// Add description in form
 						if (!empty($conf->global->PRODUIT_DESC_IN_FORM))
 						{
-							//$text .= (! empty($objp->description) && $objp->description!=$objp->plabel)?'<br>'.dol_htmlentitiesbr($objp->description):'';
+							//$text .= (! empty($objp->description) && $objp->description!=$objp->product_label)?'<br>'.dol_htmlentitiesbr($objp->description):'';
 							$description = ''; // Already added into main visible desc
 						}
 
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index 61942d03f45..8574b7ce01b 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -104,7 +104,7 @@ class box_shipments extends ModeleBoxes
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."commande as c ON el.fk_source = c.rowid AND el.sourcetype IN ('commande') AND el.targettype = 'shipping'";
             $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
-            $sql .= " WHERE e.entity = ".$conf->entity;
+            $sql .= " WHERE e.entity IN (".getEntity('expedition').")";
             if (!empty($conf->global->ORDER_BOX_LAST_SHIPMENTS_VALIDATED_ONLY)) $sql .= " AND e.fk_statut = 1";
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND sc.fk_user = ".$user->id;
             else $sql .= " ORDER BY e.date_delivery, e.ref DESC ";
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 5ba940f2af2..cdc1dd51440 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -95,7 +95,7 @@ class box_supplier_orders extends ModeleBoxes
             $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
+            $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
             if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
             if ($conf->global->MAIN_LASTBOX_ON_OBJECT_DATE) $sql .= " ORDER BY c.date_commande DESC, c.ref DESC ";
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 952e0b78d92..54b8955d519 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -95,8 +95,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
             $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
             $sql .= " WHERE c.fk_soc = s.rowid";
-            $sql .= " AND c.entity = ".$conf->entity;
-
+            $sql .= " AND c.entity IN (".getEntity('supplier_order').")";
             $sql .= " AND c.fk_statut = ".CommandeFournisseur::STATUS_ORDERSENT;
             if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
             if ($user->socid) $sql .= " AND s.rowid = ".$user->socid;
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index 378aea61df5..b4eddf5f18d 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -46,6 +46,9 @@ class box_validated_projects extends ModeleBoxes
     public $info_box_head = array();
     public $info_box_contents = array();
 
+    public $enabled = 1;
+
+
     /**
      *  Constructor
      *
@@ -54,15 +57,17 @@ class box_validated_projects extends ModeleBoxes
      */
     public function __construct($db, $param = '')
     {
-        global $user, $langs;
+        global $conf, $user, $langs;
 
         // Load translation files required by the page
         $langs->loadLangs(array('boxes', 'projects'));
 
         $this->db = $db;
-        $this->boxlabel = "ValidatedProjects";
+        $this->boxlabel = "ProjectsWithTask";
 
         $this->hidden = ! ($user->rights->projet->lire);
+
+		if ($conf->global->MAIN_FEATURES_LEVEL < 2) $this->enabled = 0;
     }
 
     /**
@@ -81,7 +86,7 @@ class box_validated_projects extends ModeleBoxes
         $totalnb = 0;
         $totalnbTask=0;
 
-        $textHead = $langs->trans("ValidatedProjects");
+        $textHead = $langs->trans("ProjectTasksWithoutTimeSpent");
         $this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
         // list the summary of the orders
@@ -96,17 +101,19 @@ class box_validated_projects extends ModeleBoxes
             $projectsListId='';
             if (! $user->rights->projet->all->lire) $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
-            $sql = "SELECT p.rowid, p.ref as Ref, p.fk_soc as Client, p.dateo as startDate,";
-            $sql.= " (SELECT COUNT(t.rowid) FROM ".MAIN_DB_PREFIX."projet_task AS t";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact AS c ON t.rowid = c.element_id";
-            $sql.= " WHERE t.fk_projet = p.rowid AND c.fk_c_type_contact != 160 AND c.fk_socpeople = ".$user->id." AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user =".$user->id.")) AS 'taskNumber'";
+            // I tried to solve sql error and performance problem, rewriting sql request but it is not clear what we want.
+            // Count of tasks without time spent for tasks we are assigned too or
+            // Count of tasks without time spent for all tasks of projects we are allowed to read (what it does) ?
+            $sql = "SELECT p.rowid, p.ref, p.fk_soc, p.dateo as startdate,";
+            $sql.= " COUNT(DISTINCT t.rowid) as tasknumber";
             $sql.= " FROM ".MAIN_DB_PREFIX."projet AS p";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task AS t ON p.rowid = t.fk_projet";
-            $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_contact AS c ON t.rowid = c.element_id";
+            $sql.= " INNER JOIN ".MAIN_DB_PREFIX."projet_task AS t ON p.rowid = t.fk_projet";
+            // TODO Replace -1, -2, -3 with ID used for type of contat project_task into llx_c_type_contact. Once done, we can switch widget as stable.
+            $sql.= " INNER JOIN ".MAIN_DB_PREFIX."element_contact as ec ON ec.element_id = t.rowid AND fk_c_type_contact IN (-1, -2, -3)";
             $sql.= " WHERE p.fk_statut = 1"; // Only open projects
+            if ($projectsListId) $sql .= ' AND p.rowid IN ('.$this->db->sanitize($projectsListId).')'; // Only project we ara allowed
 			$sql.= " AND t.rowid NOT IN (SELECT fk_task FROM ".MAIN_DB_PREFIX."projet_task_time WHERE fk_user =".$user->id.")";
-			$sql.= " AND c.fk_socpeople = ".$user->id;
-			$sql.= " GROUP BY p.ref";
+			$sql.= " GROUP BY p.rowid, p.ref, p.fk_soc, p.dateo";
             $sql.= " ORDER BY p.dateo ASC";
 
             $result = $this->db->query($sql);
@@ -135,10 +142,7 @@ class box_validated_projects extends ModeleBoxes
                     $objp = $this->db->fetch_object($result);
 
                     $projectstatic->id = $objp->rowid;
-                    $projectstatic->ref = $objp->Ref;
-                    $projectstatic->customer = $objp->Client;
-                    $projectstatic->startDate = $objp->startDate;
-                    $projectstatic->taskNumber = $objp->taskNumber;
+                    $projectstatic->ref = $objp->ref;
 
                     $this->info_box_contents[$i][] = array(
                         'td' => 'class="nowraponall"',
@@ -146,21 +150,26 @@ class box_validated_projects extends ModeleBoxes
                         'asis' => 1
                     );
 
-                    $sql = 'SELECT rowid, nom FROM '.MAIN_DB_PREFIX.'societe WHERE rowid ='.$objp->Client;
-					$resql = $this->db->query($sql);
-					if ($resql){
-						$socstatic = new Societe($this->db);
-						$obj = $this->db->fetch_object($resql);
-						$this->info_box_contents[$i][] = array(
-							'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
-							'text' => $obj->nom,
-							'asis' => 1,
-							'url' => DOL_URL_ROOT.'/societe/card.php?socid='.$obj->rowid
-						);
-					}
-					else {
-						dol_print_error($this->db);
-					}
+                    if ($objp->fk_soc > 0) {
+                    	$sql = 'SELECT rowid, nom as name FROM '.MAIN_DB_PREFIX.'societe WHERE rowid ='.$objp->fk_soc;
+                    	$resql = $this->db->query($sql);
+                    	//$socstatic = new Societe($this->db);
+                    	$obj2 = $this->db->fetch_object($resql);
+                    	$this->info_box_contents[$i][] = array(
+                    		'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
+                    		'text' => $obj2->name,
+                    		'asis' => 1,
+                    		'url' => DOL_URL_ROOT.'/societe/card.php?socid='.$obj2->rowid
+                    	);
+                    }
+                    else {
+                    	$this->info_box_contents[$i][] = array(
+                    		'td' => 'class="tdoverflowmax150 maxwidth200onsmartphone"',
+                    		'text' => '',
+                    		'asis' => 1,
+                    		'url' => ''
+                    	);
+                    }
 
                     $this->info_box_contents[$i][] = array(
                         'td' => 'class="center"',
@@ -169,7 +178,7 @@ class box_validated_projects extends ModeleBoxes
 
                     $this->info_box_contents[$i][] = array(
                         'td' => 'class="center"',
-                        'text' => $objp->taskNumber."&nbsp;".$langs->trans("Tasks"),
+                        'text' => $objp->tasknumber."&nbsp;".$langs->trans("Tasks"),
 						'asis' => 1,
                     );
                     $i++;
diff --git a/htdocs/core/boxes/intracommreport_box.php b/htdocs/core/boxes/intracommreport_box.php
new file mode 100644
index 00000000000..1df09500173
--- /dev/null
+++ b/htdocs/core/boxes/intracommreport_box.php
@@ -0,0 +1,88 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) <year>  <name of author>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\file		core/boxes/mybox.php
+ * 	\ingroup	intracommreport
+ * 	\brief		This file is a sample box definition file
+ * 				Put some comments here
+ */
+include_once DOL_DOCUMENT_ROOT . "/core/boxes/modules_boxes.php";
+
+/**
+ * Class to manage the box
+ */
+class intracommreportbox extends ModeleBoxes
+{
+
+    public $boxcode = "mybox";
+    public $boximg = "intracommreport";
+    public $boxlabel;
+    public $depends = array("intracommreport");
+    public $db;
+    public $param;
+    public $info_box_head = array();
+    public $info_box_contents = array();
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        global $langs;
+        $langs->load("boxes");
+
+        $this->boxlabel = $langs->transnoentitiesnoconv("MyBox");
+    }
+
+    /**
+     * Load data into info_box_contents array to show array later.
+     *
+     * 	@param		int		$max		Maximum number of records to load
+     * 	@return		void
+     */
+    public function loadBox($max = 5)
+    {
+        global $conf, $user, $langs, $db;
+
+        $this->max = $max;
+
+        //include_once DOL_DOCUMENT_ROOT . "/intracommreport/class/intracommreport.class.php";
+
+        $text = $langs->trans("MyBoxDescription", $max);
+        $this->info_box_head = array(
+            'text' => $text,
+            'limit' => dol_strlen($text)
+        );
+
+        $this->info_box_contents[0][0] = array('td' => 'align="left"',
+            'text' => $langs->trans("MyBoxContent"));
+    }
+
+    /**
+     * 	Method to show box
+     *
+     * 	@param	array	$head       Array with properties of box title
+     * 	@param  array	$contents   Array with properties of box lines
+     * 	@return	void
+     */
+    public function showBox($head = null, $contents = null)
+    {
+        parent::showBox($this->info_box_head, $this->info_box_contents);
+    }
+}
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index a083576aacb..39ae2eb63ef 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -186,7 +186,7 @@ class Comment extends CommonObject
 		$sql .= " c.entity,";
 		$sql .= " c.import_key";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as c";
-		$sql .= " WHERE c.rowid = ".$id;
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index f25a0694f7d..6015bbceece 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -40,199 +40,199 @@ abstract class CommonDocGenerator
 	 */
 	public $error = '';
 
-    /**
-     * @var string[]    Array of error strings
-     */
-    public $errors = array();
+	/**
+	 * @var string[]    Array of error strings
+	 */
+	public $errors = array();
 
 	/**
-     * @var DoliDB Database handler.
-     */
+	 * @var DoliDB Database handler.
+	 */
 	protected $db;
 
-    /**
-     * @var Extrafields object
-     */
+	/**
+	 * @var Extrafields object
+	 */
 	public $extrafieldsCache;
 
 	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-	*/
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   User		$user           User
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_user($user, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   User		$user           User
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_user($user, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-        $logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
+		$logotouse = $conf->user->dir_output.'/'.get_exdir($user->id, 2, 0, 1, $user, 'user').'/'.$user->photo;
 
-        return array(
-            'myuser_lastname'=>$user->lastname,
-            'myuser_firstname'=>$user->firstname,
-            'myuser_fullname'=>$user->getFullName($outputlangs, 1),
-            'myuser_login'=>$user->login,
-            'myuser_phone'=>$user->office_phone,
-       		'myuser_address'=>$user->address,
-       		'myuser_zip'=>$user->zip,
-       		'myuser_town'=>$user->town,
-       		'myuser_country'=>$user->country,
-        	'myuser_country_code'=>$user->country_code,
-       		'myuser_state'=>$user->state,
-        	'myuser_state_code'=>$user->state_code,
-        	'myuser_fax'=>$user->office_fax,
-            'myuser_mobile'=>$user->user_mobile,
-            'myuser_email'=>$user->email,
-        	'myuser_logo'=>$logotouse,
-        	'myuser_job'=>$user->job,
-            'myuser_web'=>''	// url not exist in $user object
-        );
-    }
+		return array(
+			'myuser_lastname'=>$user->lastname,
+			'myuser_firstname'=>$user->firstname,
+			'myuser_fullname'=>$user->getFullName($outputlangs, 1),
+			'myuser_login'=>$user->login,
+			'myuser_phone'=>$user->office_phone,
+	   		'myuser_address'=>$user->address,
+	   		'myuser_zip'=>$user->zip,
+	   		'myuser_town'=>$user->town,
+	   		'myuser_country'=>$user->country,
+			'myuser_country_code'=>$user->country_code,
+	   		'myuser_state'=>$user->state,
+			'myuser_state_code'=>$user->state_code,
+			'myuser_fax'=>$user->office_fax,
+			'myuser_mobile'=>$user->user_mobile,
+			'myuser_email'=>$user->email,
+			'myuser_logo'=>$logotouse,
+			'myuser_job'=>$user->job,
+			'myuser_web'=>''	// url not exist in $user object
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Societe		$mysoc			Object thirdparty
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_mysoc($mysoc, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Societe		$mysoc			Object thirdparty
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_mysoc($mysoc, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-        if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
-        {
-            $mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
-        }
-        if (empty($mysoc->country) && !empty($mysoc->country_code))
-        {
-        	$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
-        }
-        if (empty($mysoc->state) && !empty($mysoc->state_code))
-        {
-        	$mysoc->state = getState($mysoc->state_code, 0);
-        }
+		if (empty($mysoc->forme_juridique) && !empty($mysoc->forme_juridique_code))
+		{
+			$mysoc->forme_juridique = getFormeJuridiqueLabel($mysoc->forme_juridique_code);
+		}
+		if (empty($mysoc->country) && !empty($mysoc->country_code))
+		{
+			$mysoc->country = $outputlangs->transnoentitiesnoconv("Country".$mysoc->country_code);
+		}
+		if (empty($mysoc->state) && !empty($mysoc->state_code))
+		{
+			$mysoc->state = getState($mysoc->state_code, 0);
+		}
 
-        $logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
+		$logotouse = $conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_small;
 
-        return array(
-            'mycompany_logo'=>$logotouse,
-            'mycompany_name'=>$mysoc->name,
-            'mycompany_email'=>$mysoc->email,
-            'mycompany_phone'=>$mysoc->phone,
-            'mycompany_fax'=>$mysoc->fax,
-            'mycompany_address'=>$mysoc->address,
-            'mycompany_zip'=>$mysoc->zip,
-            'mycompany_town'=>$mysoc->town,
-            'mycompany_country'=>$mysoc->country,
-            'mycompany_country_code'=>$mysoc->country_code,
-            'mycompany_state'=>$mysoc->state,
-            'mycompany_state_code'=>$mysoc->state_code,
-        	'mycompany_web'=>$mysoc->url,
-            'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
-            'mycompany_managers'=>$mysoc->managers,
-            'mycompany_capital'=>$mysoc->capital,
-            'mycompany_barcode'=>$mysoc->barcode,
-            'mycompany_idprof1'=>$mysoc->idprof1,
-            'mycompany_idprof2'=>$mysoc->idprof2,
-            'mycompany_idprof3'=>$mysoc->idprof3,
-            'mycompany_idprof4'=>$mysoc->idprof4,
-            'mycompany_idprof5'=>$mysoc->idprof5,
-            'mycompany_idprof6'=>$mysoc->idprof6,
-        	'mycompany_vatnumber'=>$mysoc->tva_intra,
+		return array(
+			'mycompany_logo'=>$logotouse,
+			'mycompany_name'=>$mysoc->name,
+			'mycompany_email'=>$mysoc->email,
+			'mycompany_phone'=>$mysoc->phone,
+			'mycompany_fax'=>$mysoc->fax,
+			'mycompany_address'=>$mysoc->address,
+			'mycompany_zip'=>$mysoc->zip,
+			'mycompany_town'=>$mysoc->town,
+			'mycompany_country'=>$mysoc->country,
+			'mycompany_country_code'=>$mysoc->country_code,
+			'mycompany_state'=>$mysoc->state,
+			'mycompany_state_code'=>$mysoc->state_code,
+			'mycompany_web'=>$mysoc->url,
+			'mycompany_juridicalstatus'=>$mysoc->forme_juridique,
+			'mycompany_managers'=>$mysoc->managers,
+			'mycompany_capital'=>$mysoc->capital,
+			'mycompany_barcode'=>$mysoc->barcode,
+			'mycompany_idprof1'=>$mysoc->idprof1,
+			'mycompany_idprof2'=>$mysoc->idprof2,
+			'mycompany_idprof3'=>$mysoc->idprof3,
+			'mycompany_idprof4'=>$mysoc->idprof4,
+			'mycompany_idprof5'=>$mysoc->idprof5,
+			'mycompany_idprof6'=>$mysoc->idprof6,
+			'mycompany_vatnumber'=>$mysoc->tva_intra,
 			'mycompany_object'=>$mysoc->object,
-            'mycompany_note_private'=>$mysoc->note_private,
-            //'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
-        );
-    }
+			'mycompany_note_private'=>$mysoc->note_private,
+			//'mycompany_note_public'=>$mysoc->note_public,        // Only private not exists for "mysoc" but both for thirdparties
+		);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param	Societe		$object			Object
-     * @param   Translate	$outputlangs    Language object for output
-     * @param   string		$array_key	    Name of the key for return array
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_thirdparty($object, $outputlangs, $array_key = 'company')
-    {
-        // phpcs:enable
-        global $conf, $extrafields;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param	Societe		$object			Object
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @param   string		$array_key	    Name of the key for return array
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_thirdparty($object, $outputlangs, $array_key = 'company')
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 
-        if (empty($object->country) && !empty($object->country_code))
-        {
-        	$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
-        }
-        if (empty($object->state) && !empty($object->state_code))
-        {
-        	$object->state = getState($object->state_code, 0);
-        }
+		if (empty($object->country) && !empty($object->country_code))
+		{
+			$object->country = $outputlangs->transnoentitiesnoconv("Country".$object->country_code);
+		}
+		if (empty($object->state) && !empty($object->state_code))
+		{
+			$object->state = getState($object->state_code, 0);
+		}
 
-        $array_thirdparty = array(
-            'company_name'=>$object->name,
-	        'company_name_alias' => $object->name_alias,
-            'company_email'=>$object->email,
-            'company_phone'=>$object->phone,
-            'company_fax'=>$object->fax,
-            'company_address'=>$object->address,
-            'company_zip'=>$object->zip,
-            'company_town'=>$object->town,
-            'company_country'=>$object->country,
-        	'company_country_code'=>$object->country_code,
-            'company_state'=>$object->state,
-        	'company_state_code'=>$object->state_code,
-        	'company_web'=>$object->url,
-            'company_barcode'=>$object->barcode,
-            'company_vatnumber'=>$object->tva_intra,
-            'company_customercode'=>$object->code_client,
-            'company_suppliercode'=>$object->code_fournisseur,
-            'company_customeraccountancycode'=>$object->code_compta,
-            'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
-            'company_juridicalstatus'=>$object->forme_juridique,
-            'company_outstanding_limit'=>$object->outstanding_limit,
-            'company_capital'=>$object->capital,
-            'company_idprof1'=>$object->idprof1,
-            'company_idprof2'=>$object->idprof2,
-            'company_idprof3'=>$object->idprof3,
-            'company_idprof4'=>$object->idprof4,
-            'company_idprof5'=>$object->idprof5,
-            'company_idprof6'=>$object->idprof6,
-            'company_note_public'=>$object->note_public,
-            'company_note_private'=>$object->note_private,
-        	'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
-        	'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
-        );
+		$array_thirdparty = array(
+			'company_name'=>$object->name,
+			'company_name_alias' => $object->name_alias,
+			'company_email'=>$object->email,
+			'company_phone'=>$object->phone,
+			'company_fax'=>$object->fax,
+			'company_address'=>$object->address,
+			'company_zip'=>$object->zip,
+			'company_town'=>$object->town,
+			'company_country'=>$object->country,
+			'company_country_code'=>$object->country_code,
+			'company_state'=>$object->state,
+			'company_state_code'=>$object->state_code,
+			'company_web'=>$object->url,
+			'company_barcode'=>$object->barcode,
+			'company_vatnumber'=>$object->tva_intra,
+			'company_customercode'=>$object->code_client,
+			'company_suppliercode'=>$object->code_fournisseur,
+			'company_customeraccountancycode'=>$object->code_compta,
+			'company_supplieraccountancycode'=>$object->code_compta_fournisseur,
+			'company_juridicalstatus'=>$object->forme_juridique,
+			'company_outstanding_limit'=>$object->outstanding_limit,
+			'company_capital'=>$object->capital,
+			'company_idprof1'=>$object->idprof1,
+			'company_idprof2'=>$object->idprof2,
+			'company_idprof3'=>$object->idprof3,
+			'company_idprof4'=>$object->idprof4,
+			'company_idprof5'=>$object->idprof5,
+			'company_idprof6'=>$object->idprof6,
+			'company_note_public'=>$object->note_public,
+			'company_note_private'=>$object->note_private,
+			'company_default_bank_iban'=>(is_object($object->bank_account) ? $object->bank_account->iban : ''),
+			'company_default_bank_bic'=>(is_object($object->bank_account) ? $object->bank_account->bic : '')
+		);
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_thirdparty = $this->fill_substitutionarray_with_extrafields($object, $array_thirdparty, $extrafields, $array_key, $outputlangs);
+		}
 		return $array_thirdparty;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
@@ -241,9 +241,9 @@ abstract class CommonDocGenerator
 	 * @param   string		$array_key	    Name of the key for return array
 	 * @return	array 						Array of substitution key->code
 	 */
-    public function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')
-    {
-        // phpcs:enable
+	public function get_substitutionarray_contact($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
 		global $conf, $extrafields;
 
 		if (empty($object->country) && !empty($object->country_code))
@@ -285,67 +285,67 @@ abstract class CommonDocGenerator
 			$array_key.'_civility' => $object->civility,
 		);
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_contact = $this->fill_substitutionarray_with_extrafields($object, $array_contact, $extrafields, $array_key, $outputlangs);
+		}
 		return $array_contact;
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Translate	$outputlangs    Language object for output
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_other($outputlangs)
-    {
-        // phpcs:enable
-    	global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_other($outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
 
-    	$now = dol_now('gmt'); // gmt
-    	$array_other = array(
-    	    // Date in default language
-    	    'current_date'=>dol_print_date($now, 'day', 'tzuser'),
-    	    'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
+		$now = dol_now('gmt'); // gmt
+		$array_other = array(
+			// Date in default language
+			'current_date'=>dol_print_date($now, 'day', 'tzuser'),
+			'current_datehour'=>dol_print_date($now, 'dayhour', 'tzuser'),
    			'current_server_date'=>dol_print_date($now, 'day', 'tzserver'),
    			'current_server_datehour'=>dol_print_date($now, 'dayhour', 'tzserver'),
-    	    // Date in requested output language
-    	    'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
+			// Date in requested output language
+			'current_date_locale'=>dol_print_date($now, 'day', 'tzuser', $outputlangs),
    			'current_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzuser', $outputlangs),
    			'current_server_date_locale'=>dol_print_date($now, 'day', 'tzserver', $outputlangs),
    			'current_server_datehour_locale'=>dol_print_date($now, 'dayhour', 'tzserver', $outputlangs),
-    	);
+		);
 
 
-    	foreach ($conf->global as $key => $val)
-    	{
-    		if (isASecretKey($key)) $newval = '*****forbidden*****';
-    		else $newval = $val;
-    		$array_other['__['.$key.']__'] = $newval;
-    	}
+		foreach ($conf->global as $key => $val)
+		{
+			if (isASecretKey($key)) $newval = '*****forbidden*****';
+			else $newval = $val;
+			$array_other['__['.$key.']__'] = $newval;
+		}
 
-    	return $array_other;
-    }
+		return $array_other;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * Define array with couple substitution key => substitution value
 	 *
 	 * @param   Object			$object             Main object to use as data source
 	 * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   string		    $array_key	        Name of the key for return array
+	 * @param   string		    $array_key	        Name of the key for return array
 	 * @return	array								Array of substitution
 	 */
 	public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf, $extrafields;
 
 		$sumpayed = $sumdeposit = $sumcreditnote = '';
@@ -381,11 +381,11 @@ abstract class CommonDocGenerator
 		$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
 		$array_key.'_source_invoice_ref'=>$invoice_source->ref,
 		// Dates
-        $array_key.'_hour'=>dol_print_date($date, 'hour'),
+		$array_key.'_hour'=>dol_print_date($date, 'hour'),
 		$array_key.'_date'=>dol_print_date($date, 'day'),
 		$array_key.'_date_rfc'=>dol_print_date($date, 'dayrfc'),
 		$array_key.'_date_limit'=>(!empty($object->date_lim_reglement) ?dol_print_date($object->date_lim_reglement, 'day') : ''),
-	    $array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),
+		$array_key.'_date_end'=>(!empty($object->fin_validite) ?dol_print_date($object->fin_validite, 'day') : ''),
 		$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
 		$array_key.'_date_modification'=>(!empty($object->date_modification) ?dol_print_date($object->date_modification, 'day') : ''),
 		$array_key.'_date_validation'=>(!empty($object->date_validation) ?dol_print_date($object->date_validation, 'dayhour') : ''),
@@ -397,7 +397,7 @@ abstract class CommonDocGenerator
 		$array_key.'_payment_term_code'=>$object->cond_reglement_code,
 		$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
 
-        $array_key.'_incoterms'=>(method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
+		$array_key.'_incoterms'=>(method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
 
 		$array_key.'_bank_iban'=>$bank_account->iban,
 		$array_key.'_bank_bic'=>$bank_account->bic,
@@ -416,8 +416,8 @@ abstract class CommonDocGenerator
 
 		$array_key.'_multicurrency_code' => price2num($object->multicurrency_code),
 		$array_key.'_multicurrency_tx' => price2num($object->multicurrency_tx),
-	    $array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
-	    $array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
+		$array_key.'_multicurrency_total_ht' => price2num($object->multicurrency_total_ht),
+		$array_key.'_multicurrency_total_tva' => price2num($object->multicurrency_total_tva),
 		$array_key.'_multicurrency_total_ttc' => price2num($object->multicurrency_total_ttc),
 		$array_key.'_multicurrency_total_ht_locale' => price($object->multicurrency_total_ht, 0, $outputlangs),
 		$array_key.'_multicurrency_total_tva_locale' => price($object->multicurrency_total_tva, 0, $outputlangs),
@@ -472,11 +472,11 @@ abstract class CommonDocGenerator
 			$totalUp = 0;
 			foreach ($object->lines as $line)
 			{
-			    // $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
+				// $line->tva_tx format depends on database field accuraty, no reliable. This is kept for backward compatibility
 				if (empty($resarray[$array_key.'_total_vat_'.$line->tva_tx])) $resarray[$array_key.'_total_vat_'.$line->tva_tx] = 0;
 				$resarray[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
 				$resarray[$array_key.'_total_vat_locale_'.$line->tva_tx] = price($resarray[$array_key.'_total_vat_'.$line->tva_tx]);
-			    // $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
+				// $vatformated is vat without not expected chars (so 20, or 8.5 or 5.99 for example)
 				$vatformated = vatrate($line->tva_tx);
 				if (empty($resarray[$array_key.'_total_vat_'.$vatformated])) $resarray[$array_key.'_total_vat_'.$vatformated] = 0;
 				$resarray[$array_key.'_total_vat_'.$vatformated] += $line->total_tva;
@@ -514,7 +514,7 @@ abstract class CommonDocGenerator
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define array with couple substitution key => substitution value
 	 *
@@ -525,7 +525,7 @@ abstract class CommonDocGenerator
 	 */
 	public function get_substitutionarray_lines($line, $outputlangs, $linenumber = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $conf;
 
 		$resarray = array(
@@ -537,9 +537,9 @@ abstract class CommonDocGenerator
 			'line_product_type'=>$line->product_type,
 			'line_desc'=>$line->desc,
 			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
-		    'line_localtax1_rate'=>vatrate($line->localtax1_tx),
-		    'line_localtax2_rate'=>vatrate($line->localtax1_tx),
-		    'line_up'=>price2num($line->subprice),
+			'line_localtax1_rate'=>vatrate($line->localtax1_tx),
+			'line_localtax2_rate'=>vatrate($line->localtax1_tx),
+			'line_up'=>price2num($line->subprice),
 			'line_up_locale'=>price($line->subprice, 0, $outputlangs),
 			'line_total_up'=>price2num($line->subprice * $line->qty),
 			'line_total_up_locale'=>price($line->subprice * $line->qty, 0, $outputlangs),
@@ -551,31 +551,31 @@ abstract class CommonDocGenerator
 			'line_price_ht_locale'=>price($line->total_ht, 0, $outputlangs),
 			'line_price_ttc_locale'=>price($line->total_ttc, 0, $outputlangs),
 			'line_price_vat_locale'=>price($line->total_tva, 0, $outputlangs),
-		    // Dates
+			// Dates
 			'line_date_start'=>dol_print_date($line->date_start, 'day'),
 			'line_date_start_locale'=>dol_print_date($line->date_start, 'day', 'tzserver', $outputlangs),
-		    'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),
-		    'line_date_end'=>dol_print_date($line->date_end, 'day'),
-		    'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
-		    'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),
+			'line_date_start_rfc'=>dol_print_date($line->date_start, 'dayrfc'),
+			'line_date_end'=>dol_print_date($line->date_end, 'day'),
+			'line_date_end_locale'=>dol_print_date($line->date_end, 'day', 'tzserver', $outputlangs),
+			'line_date_end_rfc'=>dol_print_date($line->date_end, 'dayrfc'),
 
-		    'line_multicurrency_code' => price2num($line->multicurrency_code),
-		    'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
-		    'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
-		    'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
-		    'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
-		    'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
-		    'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
-		    'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
-		    'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
+			'line_multicurrency_code' => price2num($line->multicurrency_code),
+			'line_multicurrency_subprice' => price2num($line->multicurrency_subprice),
+			'line_multicurrency_total_ht' => price2num($line->multicurrency_total_ht),
+			'line_multicurrency_total_tva' => price2num($line->multicurrency_total_tva),
+			'line_multicurrency_total_ttc' => price2num($line->multicurrency_total_ttc),
+			'line_multicurrency_subprice_locale' => price($line->multicurrency_subprice, 0, $outputlangs),
+			'line_multicurrency_total_ht_locale' => price($line->multicurrency_total_ht, 0, $outputlangs),
+			'line_multicurrency_total_tva_locale' => price($line->multicurrency_total_tva, 0, $outputlangs),
+			'line_multicurrency_total_ttc_locale' => price($line->multicurrency_total_ttc, 0, $outputlangs),
 		);
 
-        // Units
+		// Units
 		if ($conf->global->PRODUCT_USE_UNITS)
 		{
-		      $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
-		      $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
-        }
+			  $resarray['line_unit'] = $outputlangs->trans($line->getLabelOfUnit('long'));
+			  $resarray['line_unit_short'] = $outputlangs->trans($line->getLabelOfUnit('short'));
+		}
 
 		// Retrieve extrafields
 		$extrafieldkey = $line->table_element;
@@ -585,14 +585,14 @@ abstract class CommonDocGenerator
 		$extrafields->fetch_name_optionals_label($extrafieldkey, true);
 		$line->fetch_optionals();
 
-        $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
-        // Check if the current line belongs to a supplier order
-        if (get_class($line) == 'CommandeFournisseurLigne')
-        {
-            // Add the product supplier extrafields to the substitutions
-            $extrafields->fetch_name_optionals_label("product_fournisseur_price");
-            $extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
+		// Check if the current line belongs to a supplier order
+		if (get_class($line) == 'CommandeFournisseurLigne')
+		{
+			// Add the product supplier extrafields to the substitutions
+			$extrafields->fetch_name_optionals_label("product_fournisseur_price");
+			$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
 
 			if (!empty($extralabels) && is_array($extralabels))
 			{
@@ -619,7 +619,7 @@ abstract class CommonDocGenerator
 					}
 				}
 			}
-        }
+		}
 
 		// Load product data optional fields to the line -> enables to use "line_options_{extrafield}"
 		if (isset($line->fk_product) && $line->fk_product > 0)
@@ -633,158 +633,158 @@ abstract class CommonDocGenerator
 		return $resarray;
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Expedition		$object             Main object to use as data source
-     * @param   Translate		$outputlangs        Lang object to use for output
-     * @param   array			$array_key	        Name of the key for return array
-     * @return	array								Array of substitution
-     */
-    public function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')
-    {
-        // phpcs:enable
-    	global $conf, $extrafields;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Expedition		$object             Main object to use as data source
+	 * @param   Translate		$outputlangs        Lang object to use for output
+	 * @param   array			$array_key	        Name of the key for return array
+	 * @return	array								Array of substitution
+	 */
+	public function get_substitutionarray_shipment($object, $outputlangs, $array_key = 'object')
+	{
+		// phpcs:enable
+		global $conf, $extrafields;
 		dol_include_once('/core/lib/product.lib.php');
 		$object->list_delivery_methods($object->shipping_method_id);
 		$calculatedVolume = ($object->trueWidth * $object->trueHeight * $object->trueDepth);
 
-    	$array_shipment = array(
-	    	$array_key.'_id'=>$object->id,
-	    	$array_key.'_ref'=>$object->ref,
-	    	$array_key.'_ref_ext'=>$object->ref_ext,
-	    	$array_key.'_ref_customer'=>$object->ref_customer,
-	    	$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
-	    	$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
-	    	$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
-	    	$array_key.'_total_ht'=>price($object->total_ht),
-	    	$array_key.'_total_vat'=>price($object->total_tva),
-	    	$array_key.'_total_ttc'=>price($object->total_ttc),
-	    	$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
-	    	$array_key.'_note_private'=>$object->note_private,
-	    	$array_key.'_note'=>$object->note_public,
-	    	$array_key.'_tracking_number'=>$object->tracking_number,
-	    	$array_key.'_tracking_url'=>$object->tracking_url,
-	    	$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
-    		$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
-    		$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
-    		$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
-    		$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
-	    	$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),
-    	);
+		$array_shipment = array(
+			$array_key.'_id'=>$object->id,
+			$array_key.'_ref'=>$object->ref,
+			$array_key.'_ref_ext'=>$object->ref_ext,
+			$array_key.'_ref_customer'=>$object->ref_customer,
+			$array_key.'_date_delivery'=>dol_print_date($object->date_delivery, 'day'),
+			$array_key.'_hour_delivery'=>dol_print_date($object->date_delivery, 'hour'),
+			$array_key.'_date_creation'=>dol_print_date($object->date_creation, 'day'),
+			$array_key.'_total_ht'=>price($object->total_ht),
+			$array_key.'_total_vat'=>price($object->total_tva),
+			$array_key.'_total_ttc'=>price($object->total_ttc),
+			$array_key.'_total_discount_ht' => price($object->getTotalDiscount()),
+			$array_key.'_note_private'=>$object->note_private,
+			$array_key.'_note'=>$object->note_public,
+			$array_key.'_tracking_number'=>$object->tracking_number,
+			$array_key.'_tracking_url'=>$object->tracking_url,
+			$array_key.'_shipping_method'=>$object->listmeths[0]['libelle'],
+			$array_key.'_weight'=>$object->trueWeight.' '.measuringUnitString(0, 'weight', $object->weight_units),
+			$array_key.'_width'=>$object->trueWidth.' '.measuringUnitString(0, 'size', $object->width_units),
+			$array_key.'_height'=>$object->trueHeight.' '.measuringUnitString(0, 'size', $object->height_units),
+			$array_key.'_depth'=>$object->trueDepth.' '.measuringUnitString(0, 'size', $object->depth_units),
+			$array_key.'_size'=>$calculatedVolume.' '.measuringUnitString(0, 'volume'),
+		);
 
-    	// Add vat by rates
-    	foreach ($object->lines as $line)
-    	{
-    		if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
-    		$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
-    	}
+		// Add vat by rates
+		foreach ($object->lines as $line)
+		{
+			if (empty($array_shipment[$array_key.'_total_vat_'.$line->tva_tx])) $array_shipment[$array_key.'_total_vat_'.$line->tva_tx] = 0;
+			$array_shipment[$array_key.'_total_vat_'.$line->tva_tx] += $line->total_tva;
+		}
 
-	    // Retrieve extrafields
-	    if (is_array($object->array_options) && count($object->array_options))
-	    {
-		    $object->fetch_optionals();
+		// Retrieve extrafields
+		if (is_array($object->array_options) && count($object->array_options))
+		{
+			$object->fetch_optionals();
 
-		    $array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
-	    }
+			$array_shipment = $this->fill_substitutionarray_with_extrafields($object, $array_shipment, $extrafields, $array_key, $outputlangs);
+		}
 
-    	return $array_shipment;
-    }
+		return $array_shipment;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Define array with couple substitution key => substitution value
-     *
-     *	@param  ExpeditionLigne	$line				Object line
-     *	@param  Translate		$outputlangs        Lang object to use for output
-     *	@return	array								Substitution array
-     */
-    public function get_substitutionarray_shipment_lines($line, $outputlangs)
-    {
-        // phpcs:enable
-        global $conf;
-        dol_include_once('/core/lib/product.lib.php');
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Define array with couple substitution key => substitution value
+	 *
+	 *	@param  ExpeditionLigne	$line				Object line
+	 *	@param  Translate		$outputlangs        Lang object to use for output
+	 *	@return	array								Substitution array
+	 */
+	public function get_substitutionarray_shipment_lines($line, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf;
+		dol_include_once('/core/lib/product.lib.php');
 
-        $resarray = array(
-	    	'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
-	    	'line_product_ref'=>$line->product_ref,
-	    	'line_product_label'=>$line->product_label,
-	    	'line_desc'=>$line->desc,
-	    	'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
-	    	'line_up'=>price($line->subprice),
-            'line_total_up'=>price($line->subprice * $line->qty),
-	    	'line_qty'=>$line->qty,
-	    	'line_qty_shipped'=>$line->qty_shipped,
-	    	'line_qty_asked'=>$line->qty_asked,
-	    	'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
-	    	'line_price_ht'=>price($line->total_ht),
-	    	'line_price_ttc'=>price($line->total_ttc),
-	    	'line_price_vat'=>price($line->total_tva),
-        	'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuringUnitString(0, 'weight', $line->weight_units),
-        	'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuringUnitString(0, 'size', $line->length_units),
-        	'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuringUnitString(0, 'surface', $line->surface_units),
-        	'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuringUnitString(0, 'volume', $line->volume_units),
-    	);
+		$resarray = array(
+			'line_fulldesc'=>doc_getlinedesc($line, $outputlangs),
+			'line_product_ref'=>$line->product_ref,
+			'line_product_label'=>$line->product_label,
+			'line_desc'=>$line->desc,
+			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
+			'line_up'=>price($line->subprice),
+			'line_total_up'=>price($line->subprice * $line->qty),
+			'line_qty'=>$line->qty,
+			'line_qty_shipped'=>$line->qty_shipped,
+			'line_qty_asked'=>$line->qty_asked,
+			'line_discount_percent'=>($line->remise_percent ? $line->remise_percent.'%' : ''),
+			'line_price_ht'=>price($line->total_ht),
+			'line_price_ttc'=>price($line->total_ttc),
+			'line_price_vat'=>price($line->total_tva),
+			'line_weight'=>empty($line->weight) ? '' : $line->weight * $line->qty_shipped.' '.measuringUnitString(0, 'weight', $line->weight_units),
+			'line_length'=>empty($line->length) ? '' : $line->length * $line->qty_shipped.' '.measuringUnitString(0, 'size', $line->length_units),
+			'line_surface'=>empty($line->surface) ? '' : $line->surface * $line->qty_shipped.' '.measuringUnitString(0, 'surface', $line->surface_units),
+			'line_volume'=>empty($line->volume) ? '' : $line->volume * $line->qty_shipped.' '.measuringUnitString(0, 'volume', $line->volume_units),
+		);
 
-        // Retrieve extrafields
-        $extrafieldkey = $line->element;
-        $array_key = "line";
-        require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        $extrafields = new ExtraFields($this->db);
-        $extrafields->fetch_name_optionals_label($extrafieldkey, true);
-        $line->fetch_optionals();
+		// Retrieve extrafields
+		$extrafieldkey = $line->element;
+		$array_key = "line";
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		$extrafields = new ExtraFields($this->db);
+		$extrafields->fetch_name_optionals_label($extrafieldkey, true);
+		$line->fetch_optionals();
 
-        $resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
+		$resarray = $this->fill_substitutionarray_with_extrafields($line, $resarray, $extrafields, $array_key, $outputlangs);
 
-        return $resarray;
-    }
+		return $resarray;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Define array with couple substitution key => substitution value
-     *
-     * @param   Object		$object    		Dolibarr Object
-     * @param   Translate	$outputlangs    Language object for output
-     * @param   boolean		$recursive    	Want to fetch child array or child object
-     * @return	array						Array of substitution key->code
-     */
-    public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
-    {
-        // phpcs:enable
-        $array_other = array();
-        if (!empty($object)) {
-            foreach ($object as $key => $value) {
-                if (!empty($value)) {
-                    if (!is_array($value) && !is_object($value)) {
-                        $array_other['object_'.$key] = $value;
-                    }
-                    if (is_array($value) && $recursive) {
-                        $array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
-                    }
-                }
-            }
-        }
-        return $array_other;
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Define array with couple substitution key => substitution value
+	 *
+	 * @param   Object		$object    		Dolibarr Object
+	 * @param   Translate	$outputlangs    Language object for output
+	 * @param   boolean		$recursive    	Want to fetch child array or child object
+	 * @return	array						Array of substitution key->code
+	 */
+	public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
+	{
+		// phpcs:enable
+		$array_other = array();
+		if (!empty($object)) {
+			foreach ($object as $key => $value) {
+				if (!empty($value)) {
+					if (!is_array($value) && !is_object($value)) {
+						$array_other['object_'.$key] = $value;
+					}
+					if (is_array($value) && $recursive) {
+						$array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
+					}
+				}
+			}
+		}
+		return $array_other;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Fill array with couple extrafield key => extrafield value
-     *
-     *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)
-     *	@param  array			$array_to_fill      Substitution array
-     *  @param  Extrafields		$extrafields        Extrafields object
-     *  @param  string			$array_key	        Prefix for name of the keys into returned array
-     *  @param  Translate		$outputlangs        Lang object to use for output
-     *	@return	array								Substitution array
-     */
-    public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
-    {
-        // phpcs:enable
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Fill array with couple extrafield key => extrafield value
+	 *
+	 *	@param  Object			$object				Object with extrafields (must have $object->array_options filled)
+	 *	@param  array			$array_to_fill      Substitution array
+	 *  @param  Extrafields		$extrafields        Extrafields object
+	 *  @param  string			$array_key	        Prefix for name of the keys into returned array
+	 *  @param  Translate		$outputlangs        Lang object to use for output
+	 *	@return	array								Substitution array
+	 */
+	public function fill_substitutionarray_with_extrafields($object, $array_to_fill, $extrafields, $array_key, $outputlangs)
+	{
+		// phpcs:enable
 		global $conf;
 
 		if (is_array($extrafields->attributes[$object->table_element]['label'])) {
@@ -875,671 +875,671 @@ abstract class CommonDocGenerator
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
-    {
-        if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
-        $pdf->line($x + $l, $y, $x + $l, $y + $h);
-        if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
-        $pdf->line($x, $y + $h, $x, $y);
-    }
-
-
-    /**
-     *  uasort callback function to Sort columns fields
-     *
-     *  @param	array			$a    			PDF lines array fields configs
-     *  @param	array			$b    			PDF lines array fields configs
-     *  @return	int								Return compare result
-     */
-    public function columnSort($a, $b)
-    {
-        if (empty($a['rank'])) { $a['rank'] = 0; }
-        if (empty($b['rank'])) { $b['rank'] = 0; }
-        if ($a['rank'] == $b['rank']) {
-            return 0;
-        }
-        return ($a['rank'] > $b['rank']) ? -1 : 1;
-    }
-
-    /**
-     *   	Prepare Array Column Field
-     *
-     *   	@param	object			$object				common object
-     *   	@param	Translate		$outputlangs		langs
-     *      @param	int				$hidedetails		Do not show line details
-     *      @param	int				$hidedesc			Do not show desc
-     *      @param	int				$hideref			Do not show ref
-     *      @return	null
-     */
-    public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-        global $conf;
-
-        $this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
-
-
-        // Sorting
-        uasort($this->cols, array($this, 'columnSort'));
-
-        // Positionning
-        $curX = $this->page_largeur - $this->marge_droite; // start from right
-
-        // Array width
-        $arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;
-
-        // Count flexible column
-        $totalDefinedColWidth = 0;
-        $countFlexCol = 0;
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            if (!$this->getColumnStatus($colKey)) continue; // continue if disabled
-
-            if (!empty($colDef['scale'])) {
-                // In case of column width is defined by percentage
-                $colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
-            }
-
-            if (empty($colDef['width'])) {
-                $countFlexCol++;
-            } else {
-                $totalDefinedColWidth += $colDef['width'];
-            }
-        }
-
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            // setting empty conf with default
-            if (!empty($colDef['title'])) {
-                $colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
-            } else {
-                $colDef['title'] = $this->defaultTitlesFieldsStyle;
-            }
-
-            // setting empty conf with default
-            if (!empty($colDef['content'])) {
-                $colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
-            } else {
-                $colDef['content'] = $this->defaultContentsFieldsStyle;
-            }
-
-            if ($this->getColumnStatus($colKey))
-            {
-                // In case of flexible column
-                if (empty($colDef['width'])) {
-                    $colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
-                }
-
-                // Set positions
-                $lastX = $curX;
-                $curX = $lastX - $colDef['width'];
-                $colDef['xStartPos'] = $curX;
-                $colDef['xEndPos']   = $lastX;
-            }
-        }
-    }
-
-    /**
-     *  get column content width from column key
-     *
-     *  @param	string      $colKey     the column key
-     *  @return	float                   width in mm
-     */
-    public function getColumnContentWidth($colKey)
-    {
-        $colDef = $this->cols[$colKey];
-        return  $colDef['width'] - $colDef['content']['padding'][3] - $colDef['content']['padding'][1];
-    }
-
-
-    /**
-     *  get column content X (abscissa) left position from column key
-     *
-     *  @param	string    $colKey    		the column key
-     *  @return	float      X position in mm
-     */
-    public function getColumnContentXStart($colKey)
-    {
-        $colDef = $this->cols[$colKey];
-        return  $colDef['xStartPos'] + $colDef['content']['padding'][3];
-    }
-
-    /**
-     *   	get column position rank from column key
-     *
-     *   	@param	string		$colKey    		the column key
-     *      @return	int         rank on success and -1 on error
-     */
-    public function getColumnRank($colKey)
-    {
-        if (!isset($this->cols[$colKey]['rank'])) return -1;
-        return  $this->cols[$colKey]['rank'];
-    }
-
-    /**
-     *  get column position rank from column key
-     *
-     *  @param	string		$newColKey    	the new column key
-     *  @param	array		$defArray    	a single column definition array
-     *  @param	string		$targetCol    	target column used to place the new column beside
-     *  @param	bool		$insertAfterTarget    	insert before or after target column ?
-     *  @return	int         new rank on success and -1 on error
-     */
-    public function insertNewColumnDef($newColKey, $defArray, $targetCol = false, $insertAfterTarget = false)
-    {
-        // prepare wanted rank
-        $rank = -1;
-
-        // try to get rank from target column
-        if (!empty($targetCol)) {
-            $rank = $this->getColumnRank($targetCol);
-            if ($rank >= 0 && $insertAfterTarget) { $rank++; }
-        }
-
-        // get rank from new column definition
-        if ($rank < 0 && !empty($defArray['rank'])) {
-            $rank = $defArray['rank'];
-        }
-
-        // error: no rank
-        if ($rank < 0) { return -1; }
-
-        foreach ($this->cols as $colKey =>& $colDef)
-        {
-            if ($rank <= $colDef['rank'])
-            {
-                $colDef['rank'] = $colDef['rank'] + 1;
-            }
-        }
-
-        $defArray['rank'] = $rank;
-        $this->cols[$newColKey] = $defArray; // array_replace is used to preserve keys
-
-        return $rank;
-    }
-
-
-    /**
-     *  print standard column content
-     *
-     *  @param	TCPDF		    $pdf    	pdf object
-     *  @param	float		$curY    	curent Y position
-     *  @param	string		$colKey    	the column key
-     *  @param	string		$columnText   column text
-     *  @return	null
-     */
-    public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
-    {
-        global $hookmanager;
-
-        $parameters = array(
-            'curY' => &$curY,
-            'columnText' => $columnText,
-            'colKey' => $colKey,
-            'pdf' => &$pdf,
-        );
-        $reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        if (!$reshook)
-        {
-            if (empty($columnText)) return;
-            $pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
-            $colDef = $this->cols[$colKey];
-            // save curent cell padding
-			$curentCellPaddinds = $pdf->getCellPaddings();
-            // set cell padding with column content definition
-			$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
-            $pdf->writeHTMLCell($colDef['width'], 2, $colDef['xStartPos'], $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
-
-            // restore cell padding
-			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-        }
-    }
-
-
-    /**
-     *  print description column content
-     *
-     *  @param	TCPDF		$pdf    	pdf object
-     *  @param	float		$curY    	curent Y position
-     *  @param	string		$colKey    	the column key
-     *  @param  object      $object CommonObject
-     *  @param  int         $i  the $object->lines array key
-     *  @param  Translate $outputlangs    Output language
-     *  @param  int $hideref hide ref
-     *  @param  int $hidedesc hide desc
-     *  @param  int $issupplierline if object need supplier product
-     *  @return null
-     */
-    public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
+	public function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
 	{
-        // load desc col params
-        $colDef = $this->cols[$colKey];
-        // save curent cell padding
-        $curentCellPaddinds = $pdf->getCellPaddings();
-        // set cell padding with column content definition
-        $pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
-
-        // line description
-        pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);
-        $posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];
-
-        // restore cell padding
-        $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-
-        // Display extrafield if needed
-        $params = array(
-            'display'         => 'list',
-            'printableEnable' => array(3),
-            'printableEnableNotEmpty' => array(4)
-        );
-        $extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
-        if (!empty($extrafieldDesc)) {
-            $this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);
-        }
-    }
-
-    /**
-     *  get extrafield content for pdf writeHtmlCell compatibility
-     *  usage for PDF line columns and object note block
-     *
-     *  @param	object		$object     common object
-     *  @param	string		$extrafieldKey    	the extrafield key
-     *  @return	string
-     */
-    public function getExtrafieldContent($object, $extrafieldKey)
-    {
-        global $hookmanager;
-
-        if (empty($object->table_element)) { return; }
-
-        $extrafieldsKeyPrefix = "options_";
-
-        // Cleanup extrafield key to remove prefix if present
-        $pos = strpos($extrafieldKey, $extrafieldsKeyPrefix);
-        if ($pos === 0) {
-            $extrafieldKey = substr($extrafieldKey, strlen($extrafieldsKeyPrefix));
-        }
-
-        $extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;
+		if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+		$pdf->line($x + $l, $y, $x + $l, $y + $h);
+		if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+		$pdf->line($x, $y + $h, $x, $y);
+	}
 
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+	/**
+	 *  uasort callback function to Sort columns fields
+	 *
+	 *  @param	array			$a    			PDF lines array fields configs
+	 *  @param	array			$b    			PDF lines array fields configs
+	 *  @return	int								Return compare result
+	 */
+	public function columnSort($a, $b)
+	{
+		if (empty($a['rank'])) { $a['rank'] = 0; }
+		if (empty($b['rank'])) { $b['rank'] = 0; }
+		if ($a['rank'] == $b['rank']) {
+			return 0;
+		}
+		return ($a['rank'] > $b['rank']) ? -1 : 1;
+	}
 
-        $extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+	/**
+	 *   	Prepare Array Column Field
+	 *
+	 *   	@param	object			$object				common object
+	 *   	@param	Translate		$outputlangs		langs
+	 *      @param	int				$hidedetails		Do not show line details
+	 *      @param	int				$hidedesc			Do not show desc
+	 *      @param	int				$hideref			Do not show ref
+	 *      @return	null
+	 */
+	public function prepareArrayColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf;
 
-        // TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
-        if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {
-            // for lack of anything better we cleanup all html tags
-            $extrafieldOutputContent = dol_string_nohtmltag($extrafieldOutputContent);
-        }
-
-        $parameters = array(
-            'object' => $object,
-            'extrafields' => $extrafields,
-            'extrafieldKey' => $extrafieldKey,
-            'extrafieldOutputContent' =>& $extrafieldOutputContent
-        );
-        $reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
-        if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-        if ($reshook)
-        {
-            $extrafieldOutputContent = $hookmanager->resPrint;
-        }
-
-        return $extrafieldOutputContent;
-    }
+		$this->defineColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 
-    /**
-     *  display extrafields columns content
-     *
-     *  @param	object		$object    	line of common object
-     *  @param Translate $outputlangs    Output language
-     *  @param array $params    array of additionals parameters
-     *  @return	double  max y value
-     */
-    public function getExtrafieldsInHtml($object, $outputlangs, $params = array())
-    {
-        global $hookmanager;
+		// Sorting
+		uasort($this->cols, array($this, 'columnSort'));
 
-        if (empty($object->table_element)) {
-            return;
-        }
+		// Positionning
+		$curX = $this->page_largeur - $this->marge_droite; // start from right
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+		// Array width
+		$arrayWidth = $this->page_largeur - $this->marge_droite - $this->marge_gauche;
 
-        $defaultParams = array(
-            'style'         => '',
-            'display'         => 'auto', // auto, table, list
-            'printableEnable' => array(1),
-            'printableEnableNotEmpty' => array(2),
+		// Count flexible column
+		$totalDefinedColWidth = 0;
+		$countFlexCol = 0;
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			if (!$this->getColumnStatus($colKey)) continue; // continue if disabled
 
-            'table'         => array(
-                'maxItemsInRow' => 2,
-                'cellspacing'   => 0,
-                'cellpadding'   => 0,
-                'border'        => 0,
-                'labelcolwidth' => '25%',
-                'arrayOfLineBreakType' => array('text', 'html')
-            ),
+			if (!empty($colDef['scale'])) {
+				// In case of column width is defined by percentage
+				$colDef['width'] = abs($arrayWidth * $colDef['scale'] / 100);
+			}
 
-            'list'         => array(
-                'separator' => '<br/>'
-            ),
+			if (empty($colDef['width'])) {
+				$countFlexCol++;
+			} else {
+				$totalDefinedColWidth += $colDef['width'];
+			}
+		}
 
-            'auto'         => array(
-                'list' => 0, // 0 for default
-                'table' => 4 // if there more than x extrafield to display
-            ),
-        );
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			// setting empty conf with default
+			if (!empty($colDef['title'])) {
+				$colDef['title'] = array_replace($this->defaultTitlesFieldsStyle, $colDef['title']);
+			} else {
+				$colDef['title'] = $this->defaultTitlesFieldsStyle;
+			}
 
-        $params = $params + $defaultParams;
+			// setting empty conf with default
+			if (!empty($colDef['content'])) {
+				$colDef['content'] = array_replace($this->defaultContentsFieldsStyle, $colDef['content']);
+			} else {
+				$colDef['content'] = $this->defaultContentsFieldsStyle;
+			}
+
+			if ($this->getColumnStatus($colKey))
+			{
+				// In case of flexible column
+				if (empty($colDef['width'])) {
+					$colDef['width'] = abs(($arrayWidth - $totalDefinedColWidth)) / $countFlexCol;
+				}
+
+				// Set positions
+				$lastX = $curX;
+				$curX = $lastX - $colDef['width'];
+				$colDef['xStartPos'] = $curX;
+				$colDef['xEndPos']   = $lastX;
+			}
+		}
+	}
+
+	/**
+	 *  get column content width from column key
+	 *
+	 *  @param	string      $colKey     the column key
+	 *  @return	float                   width in mm
+	 */
+	public function getColumnContentWidth($colKey)
+	{
+		$colDef = $this->cols[$colKey];
+		return  $colDef['width'] - $colDef['content']['padding'][3] - $colDef['content']['padding'][1];
+	}
 
 
-        /**
-         * @var $extrafields ExtraFields
-         */
+	/**
+	 *  get column content X (abscissa) left position from column key
+	 *
+	 *  @param	string    $colKey    		the column key
+	 *  @return	float      X position in mm
+	 */
+	public function getColumnContentXStart($colKey)
+	{
+		$colDef = $this->cols[$colKey];
+		return  $colDef['xStartPos'] + $colDef['content']['padding'][3];
+	}
 
-        $html = '';
-        $fields = array();
+	/**
+	 *   	get column position rank from column key
+	 *
+	 *   	@param	string		$colKey    		the column key
+	 *      @return	int         rank on success and -1 on error
+	 */
+	public function getColumnRank($colKey)
+	{
+		if (!isset($this->cols[$colKey]['rank'])) return -1;
+		return  $this->cols[$colKey]['rank'];
+	}
 
-        if (is_array($extrafields->attributes[$object->table_element]['label'])) {
-            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-            {
-                // Enable extrafield ?
-                $enabled = 0;
-                $disableOnEmpty = 0;
-                if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
-                    $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
-                    if (in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty'])) {
-                        $enabled = 1;
-                    }
+	/**
+	 *  get column position rank from column key
+	 *
+	 *  @param	string		$newColKey    	the new column key
+	 *  @param	array		$defArray    	a single column definition array
+	 *  @param	string		$targetCol    	target column used to place the new column beside
+	 *  @param	bool		$insertAfterTarget    	insert before or after target column ?
+	 *  @return	int         new rank on success and -1 on error
+	 */
+	public function insertNewColumnDef($newColKey, $defArray, $targetCol = false, $insertAfterTarget = false)
+	{
+		// prepare wanted rank
+		$rank = -1;
 
-                    if (in_array($printable, $params['printableEnableNotEmpty'])) {
-                        $disableOnEmpty = 1;
-                    }
-                }
+		// try to get rank from target column
+		if (!empty($targetCol)) {
+			$rank = $this->getColumnRank($targetCol);
+			if ($rank >= 0 && $insertAfterTarget) { $rank++; }
+		}
 
-                if (empty($enabled)) {
-                    continue;
-                }
+		// get rank from new column definition
+		if ($rank < 0 && !empty($defArray['rank'])) {
+			$rank = $defArray['rank'];
+		}
 
-                $field = new stdClass();
-                $field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);
-                $field->content = $this->getExtrafieldContent($object, $key);
-                $field->label = $outputlangs->transnoentities($label);
-                $field->type = $extrafields->attributes[$object->table_element]['type'][$key];
+		// error: no rank
+		if ($rank < 0) { return -1; }
 
-                // dont display if empty
-                if ($disableOnEmpty && empty($field->content)) {
-                    continue;
-                }
+		foreach ($this->cols as $colKey =>& $colDef)
+		{
+			if ($rank <= $colDef['rank'])
+			{
+				$colDef['rank'] = $colDef['rank'] + 1;
+			}
+		}
 
-                $fields[] = $field;
-            }
-        }
+		$defArray['rank'] = $rank;
+		$this->cols[$newColKey] = $defArray; // array_replace is used to preserve keys
 
-        if (!empty($fields))
-        {
-            // Sort extrafields by rank
-            uasort($fields, function ($a, $b) {
-                return  ($a->rank > $b->rank) ? 1 : -1;
+		return $rank;
+	}
+
+
+	/**
+	 *  print standard column content
+	 *
+	 *  @param	TCPDF		    $pdf    	pdf object
+	 *  @param	float		$curY    	curent Y position
+	 *  @param	string		$colKey    	the column key
+	 *  @param	string		$columnText   column text
+	 *  @return	null
+	 */
+	public function printStdColumnContent($pdf, &$curY, $colKey, $columnText = '')
+	{
+		global $hookmanager;
+
+		$parameters = array(
+			'curY' => &$curY,
+			'columnText' => $columnText,
+			'colKey' => $colKey,
+			'pdf' => &$pdf,
+		);
+		$reshook = $hookmanager->executeHooks('printStdColumnContent', $parameters, $this); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if (!$reshook)
+		{
+			if (empty($columnText)) return;
+			$pdf->SetXY($this->getColumnContentXStart($colKey), $curY); // Set curent position
+			$colDef = $this->cols[$colKey];
+			// save curent cell padding
+			$curentCellPaddinds = $pdf->getCellPaddings();
+			// set cell padding with column content definition
+			$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+			$pdf->writeHTMLCell($colDef['width'], 2, $colDef['xStartPos'], $curY, $columnText, 0, 1, 0, true, $colDef['content']['align']);
+
+			// restore cell padding
+			$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+		}
+	}
+
+
+	/**
+	 *  print description column content
+	 *
+	 *  @param	TCPDF		$pdf    	pdf object
+	 *  @param	float		$curY    	curent Y position
+	 *  @param	string		$colKey    	the column key
+	 *  @param  object      $object CommonObject
+	 *  @param  int         $i  the $object->lines array key
+	 *  @param  Translate $outputlangs    Output language
+	 *  @param  int $hideref hide ref
+	 *  @param  int $hidedesc hide desc
+	 *  @param  int $issupplierline if object need supplier product
+	 *  @return null
+	 */
+	public function printColDescContent($pdf, &$curY, $colKey, $object, $i, $outputlangs, $hideref = 0, $hidedesc = 0, $issupplierline = 0)
+	{
+		// load desc col params
+		$colDef = $this->cols[$colKey];
+		// save curent cell padding
+		$curentCellPaddinds = $pdf->getCellPaddings();
+		// set cell padding with column content definition
+		$pdf->setCellPaddings($colDef['content']['padding'][3], $colDef['content']['padding'][0], $colDef['content']['padding'][1], $colDef['content']['padding'][2]);
+
+		// line description
+		pdf_writelinedesc($pdf, $object, $i, $outputlangs, $colDef['width'], 3, $colDef['xStartPos'], $curY, $hideref, $hidedesc, $issupplierline);
+		$posYAfterDescription = $pdf->GetY() - $colDef['content']['padding'][0];
+
+		// restore cell padding
+		$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+
+		// Display extrafield if needed
+		$params = array(
+			'display'         => 'list',
+			'printableEnable' => array(3),
+			'printableEnableNotEmpty' => array(4)
+		);
+		$extrafieldDesc = $this->getExtrafieldsInHtml($object->lines[$i], $outputlangs, $params);
+		if (!empty($extrafieldDesc)) {
+			$this->printStdColumnContent($pdf, $posYAfterDescription, $colKey, $extrafieldDesc);
+		}
+	}
+
+	/**
+	 *  get extrafield content for pdf writeHtmlCell compatibility
+	 *  usage for PDF line columns and object note block
+	 *
+	 *  @param	object		$object     common object
+	 *  @param	string		$extrafieldKey    	the extrafield key
+	 *  @return	string
+	 */
+	public function getExtrafieldContent($object, $extrafieldKey)
+	{
+		global $hookmanager;
+
+		if (empty($object->table_element)) { return; }
+
+		$extrafieldsKeyPrefix = "options_";
+
+		// Cleanup extrafield key to remove prefix if present
+		$pos = strpos($extrafieldKey, $extrafieldsKeyPrefix);
+		if ($pos === 0) {
+			$extrafieldKey = substr($extrafieldKey, strlen($extrafieldsKeyPrefix));
+		}
+
+		$extrafieldOptionsKey = $extrafieldsKeyPrefix.$extrafieldKey;
+
+
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
+
+		$extrafieldOutputContent = $extrafields->showOutputField($extrafieldKey, $object->array_options[$extrafieldOptionsKey], '', $object->table_element);
+
+		// TODO : allow showOutputField to be pdf public friendly, ex: in a link to object, clean getNomUrl to remove link and images... like a getName methode ...
+		if ($extrafields->attributes[$object->table_element]['type'][$extrafieldKey] == 'link') {
+			// for lack of anything better we cleanup all html tags
+			$extrafieldOutputContent = dol_string_nohtmltag($extrafieldOutputContent);
+		}
+
+		$parameters = array(
+			'object' => $object,
+			'extrafields' => $extrafields,
+			'extrafieldKey' => $extrafieldKey,
+			'extrafieldOutputContent' =>& $extrafieldOutputContent
+		);
+		$reshook = $hookmanager->executeHooks('getPDFExtrafieldContent', $parameters, $this); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook)
+		{
+			$extrafieldOutputContent = $hookmanager->resPrint;
+		}
+
+		return $extrafieldOutputContent;
+	}
+
+
+	/**
+	 *  display extrafields columns content
+	 *
+	 *  @param	object		$object    	line of common object
+	 *  @param Translate $outputlangs    Output language
+	 *  @param array $params    array of additionals parameters
+	 *  @return	double  max y value
+	 */
+	public function getExtrafieldsInHtml($object, $outputlangs, $params = array())
+	{
+		global $hookmanager;
+
+		if (empty($object->table_element)) {
+			return;
+		}
+
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
+
+		$defaultParams = array(
+			'style'         => '',
+			'display'         => 'auto', // auto, table, list
+			'printableEnable' => array(1),
+			'printableEnableNotEmpty' => array(2),
+
+			'table'         => array(
+				'maxItemsInRow' => 2,
+				'cellspacing'   => 0,
+				'cellpadding'   => 0,
+				'border'        => 0,
+				'labelcolwidth' => '25%',
+				'arrayOfLineBreakType' => array('text', 'html')
+			),
+
+			'list'         => array(
+				'separator' => '<br/>'
+			),
+
+			'auto'         => array(
+				'list' => 0, // 0 for default
+				'table' => 4 // if there more than x extrafield to display
+			),
+		);
+
+		$params = $params + $defaultParams;
+
+
+		/**
+		 * @var $extrafields ExtraFields
+		 */
+
+		$html = '';
+		$fields = array();
+
+		if (is_array($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
+			{
+				// Enable extrafield ?
+				$enabled = 0;
+				$disableOnEmpty = 0;
+				if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
+					$printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
+					if (in_array($printable, $params['printableEnable']) || in_array($printable, $params['printableEnableNotEmpty'])) {
+						$enabled = 1;
+					}
+
+					if (in_array($printable, $params['printableEnableNotEmpty'])) {
+						$disableOnEmpty = 1;
+					}
+				}
+
+				if (empty($enabled)) {
+					continue;
+				}
+
+				$field = new stdClass();
+				$field->rank = intval($extrafields->attributes[$object->table_element]['pos'][$key]);
+				$field->content = $this->getExtrafieldContent($object, $key);
+				$field->label = $outputlangs->transnoentities($label);
+				$field->type = $extrafields->attributes[$object->table_element]['type'][$key];
+
+				// dont display if empty
+				if ($disableOnEmpty && empty($field->content)) {
+					continue;
+				}
+
+				$fields[] = $field;
+			}
+		}
+
+		if (!empty($fields))
+		{
+			// Sort extrafields by rank
+			uasort($fields, function ($a, $b) {
+				return  ($a->rank > $b->rank) ? 1 : -1;
 			});
 
-            // define some HTML content with style
-            $html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';
+			// define some HTML content with style
+			$html .= !empty($params['style']) ? '<style>'.$params['style'].'</style>' : '';
 
-            // auto select display format
-            if ($params['display'] == 'auto') {
-                $lastNnumbItems = 0;
-                foreach ($params['auto'] as $display => $numbItems) {
-                    if ($lastNnumbItems <= $numbItems && count($fields) > $numbItems) {
-                        $lastNnumbItems = $numbItems;
-                        $params['display'] = $display;
-                    }
-                }
-            }
+			// auto select display format
+			if ($params['display'] == 'auto') {
+				$lastNnumbItems = 0;
+				foreach ($params['auto'] as $display => $numbItems) {
+					if ($lastNnumbItems <= $numbItems && count($fields) > $numbItems) {
+						$lastNnumbItems = $numbItems;
+						$params['display'] = $display;
+					}
+				}
+			}
 
-            if ($params['display'] == 'list') {
-                // Display in list format
-                $i = 0;
-                foreach ($fields as $field) {
-                    $html .= !empty($i) ? $params['list']['separator'] : '';
-                    $html .= '<strong>'.$field->label.' : </strong>';
-                    $html .= $field->content;
-                    $i++;
-                }
-            } elseif ($params['display'] == 'table') {
-                // Display in table format
-                $html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';
+			if ($params['display'] == 'list') {
+				// Display in list format
+				$i = 0;
+				foreach ($fields as $field) {
+					$html .= !empty($i) ? $params['list']['separator'] : '';
+					$html .= '<strong>'.$field->label.' : </strong>';
+					$html .= $field->content;
+					$i++;
+				}
+			} elseif ($params['display'] == 'table') {
+				// Display in table format
+				$html .= '<table class="extrafield-table" cellspacing="'.$params['table']['cellspacing'].'" cellpadding="'.$params['table']['cellpadding'].'" border="'.$params['table']['border'].'">';
 
-                $html .= "<tr>";
-                $itemsInRow = 0;
-                $maxItemsInRow = $params['table']['maxItemsInRow'];
-                foreach ($fields as $field) {
-                    //$html.= !empty($html)?'<br/>':'';
-                    if ($itemsInRow >= $maxItemsInRow) {
-                        // start a new line
-                        $html .= "</tr><tr>";
-                        $itemsInRow = 0;
-                    }
+				$html .= "<tr>";
+				$itemsInRow = 0;
+				$maxItemsInRow = $params['table']['maxItemsInRow'];
+				foreach ($fields as $field) {
+					//$html.= !empty($html)?'<br/>':'';
+					if ($itemsInRow >= $maxItemsInRow) {
+						// start a new line
+						$html .= "</tr><tr>";
+						$itemsInRow = 0;
+					}
 
-                    // for some type we need line break
-                    if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {
-                        if ($itemsInRow > 0) {
-                            // close table row and empty cols
-                            for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
-                                $html .= "<td ></td><td></td>";
-                            }
-                            $html .= "</tr>";
+					// for some type we need line break
+					if (in_array($field->type, $params['table']['arrayOfLineBreakType'])) {
+						if ($itemsInRow > 0) {
+							// close table row and empty cols
+							for ($i = $itemsInRow; $i <= $maxItemsInRow; $i++) {
+								$html .= "<td ></td><td></td>";
+							}
+							$html .= "</tr>";
 
-                            // start a new line
-                            $html .= "<tr>";
-                        }
+							// start a new line
+							$html .= "<tr>";
+						}
 
-                        $itemsInRow = $maxItemsInRow;
-                        $html .= '<td colspan="'.($maxItemsInRow * 2 - 1).'">';
-                        $html .= '<strong>'.$field->label.' :</strong> ';
-                        $html .= $field->content;
-                        $html .= "</td>";
-                    } else {
-                        $itemsInRow++;
-                        $html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';
-                        $html .= '<strong>'.$field->label.' :</strong>';
-                        $html .= "</td>";
+						$itemsInRow = $maxItemsInRow;
+						$html .= '<td colspan="'.($maxItemsInRow * 2 - 1).'">';
+						$html .= '<strong>'.$field->label.' :</strong> ';
+						$html .= $field->content;
+						$html .= "</td>";
+					} else {
+						$itemsInRow++;
+						$html .= '<td width="'.$params['table']['labelcolwidth'].'" class="extrafield-label">';
+						$html .= '<strong>'.$field->label.' :</strong>';
+						$html .= "</td>";
 
 
-                        $html .= '<td  class="extrafield-content">';
-                        $html .= $field->content;
-                        $html .= "</td>";
-                    }
-                }
-                $html .= "</tr>";
+						$html .= '<td  class="extrafield-content">';
+						$html .= $field->content;
+						$html .= "</td>";
+					}
+				}
+				$html .= "</tr>";
 
-                $html .= '</table>';
-            }
-        }
+				$html .= '</table>';
+			}
+		}
 
-        return $html;
-    }
+		return $html;
+	}
 
 
-    /**
-     *  get column status from column key
-     *
-     *  @param	string			$colKey    		the column key
-     *  @return	float      width in mm
-     */
-    public function getColumnStatus($colKey)
-    {
-        if (!empty($this->cols[$colKey]['status'])) {
-            return true;
-        } else return  false;
-    }
+	/**
+	 *  get column status from column key
+	 *
+	 *  @param	string			$colKey    		the column key
+	 *  @return	float      width in mm
+	 */
+	public function getColumnStatus($colKey)
+	{
+		if (!empty($this->cols[$colKey]['status'])) {
+			return true;
+		} else return  false;
+	}
 
-    /**
-     * Print standard column content
-     *
-     * @param TCPDI	    $pdf            Pdf object
-     * @param float     $tab_top        Tab top position
-     * @param float     $tab_height     Default tab height
-     * @param Translate $outputlangs    Output language
-     * @param int       $hidetop        Hide top
-     * @return float                    Height of col tab titles
-     */
-    public function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)
-    {
-        global $hookmanager, $conf;
+	/**
+	 * Print standard column content
+	 *
+	 * @param TCPDI	    $pdf            Pdf object
+	 * @param float     $tab_top        Tab top position
+	 * @param float     $tab_height     Default tab height
+	 * @param Translate $outputlangs    Output language
+	 * @param int       $hidetop        Hide top
+	 * @return float                    Height of col tab titles
+	 */
+	public function pdfTabTitles(&$pdf, $tab_top, $tab_height, $outputlangs, $hidetop = 0)
+	{
+		global $hookmanager, $conf;
 
-        foreach ($this->cols as $colKey => $colDef) {
-            $parameters = array(
-                'colKey' => $colKey,
-                'pdf' => $pdf,
-                'outputlangs' => $outputlangs,
-                'tab_top' => $tab_top,
-                'tab_height' => $tab_height,
-                'hidetop' => $hidetop
-            );
+		foreach ($this->cols as $colKey => $colDef) {
+			$parameters = array(
+				'colKey' => $colKey,
+				'pdf' => $pdf,
+				'outputlangs' => $outputlangs,
+				'tab_top' => $tab_top,
+				'tab_height' => $tab_height,
+				'hidetop' => $hidetop
+			);
 
-            $reshook = $hookmanager->executeHooks('pdfTabTitles', $parameters, $this); // Note that $object may have been modified by hook
-            if ($reshook < 0) {
-                setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-            } elseif (empty($reshook)) {
-                if (!$this->getColumnStatus($colKey)) continue;
+			$reshook = $hookmanager->executeHooks('pdfTabTitles', $parameters, $this); // Note that $object may have been modified by hook
+			if ($reshook < 0) {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			} elseif (empty($reshook)) {
+				if (!$this->getColumnStatus($colKey)) continue;
 
-                // get title label
-                $colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
+				// get title label
+				$colDef['title']['label'] = !empty($colDef['title']['label']) ? $colDef['title']['label'] : $outputlangs->transnoentities($colDef['title']['textkey']);
 
-                // Add column separator
-                if (!empty($colDef['border-left'])) {
-                    $pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
-                }
+				// Add column separator
+				if (!empty($colDef['border-left'])) {
+					$pdf->line($colDef['xStartPos'], $tab_top, $colDef['xStartPos'], $tab_top + $tab_height);
+				}
 
-                if (empty($hidetop)) {
-                    // save curent cell padding
-                    $curentCellPaddinds = $pdf->getCellPaddings();
+				if (empty($hidetop)) {
+					// save curent cell padding
+					$curentCellPaddinds = $pdf->getCellPaddings();
 
-                    // Add space for lines (more if we need to show a second alternative language)
-                    global $outputlangsbis;
-                    if (is_object($outputlangsbis)) {
-                        // set cell padding with column title definition
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
-                    } else {
-                        // set cell padding with column title definition
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
-                    }
+					// Add space for lines (more if we need to show a second alternative language)
+					global $outputlangsbis;
+					if (is_object($outputlangsbis)) {
+						// set cell padding with column title definition
+						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], 0.5);
+					} else {
+						// set cell padding with column title definition
+						$pdf->setCellPaddings($colDef['title']['padding'][3], $colDef['title']['padding'][0], $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
+					}
 
-                    $pdf->SetXY($colDef['xStartPos'], $tab_top);
-                    $textWidth = $colDef['width'];
-                    $pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
+					$pdf->SetXY($colDef['xStartPos'], $tab_top);
+					$textWidth = $colDef['width'];
+					$pdf->MultiCell($textWidth, 2, $colDef['title']['label'], '', $colDef['title']['align']);
 
-                    // Add variant of translation if $outputlangsbis is an object
-                    if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {
-                        $pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
-                    	$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
-                    	$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
-                    	$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
-                    }
+					// Add variant of translation if $outputlangsbis is an object
+					if (is_object($outputlangsbis) && trim($colDef['title']['label'])) {
+						$pdf->setCellPaddings($colDef['title']['padding'][3], 0, $colDef['title']['padding'][1], $colDef['title']['padding'][2]);
+						$pdf->SetXY($colDef['xStartPos'], $pdf->GetY());
+						$textbis = $outputlangsbis->transnoentities($colDef['title']['textkey']);
+						$pdf->MultiCell($textWidth, 2, $textbis, '', $colDef['title']['align']);
+					}
 
-                    $this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);
+					$this->tabTitleHeight = max($pdf->GetY() - $tab_top, $this->tabTitleHeight);
 
-                    // restore cell padding
-                    $pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
-                }
-            }
-        }
+					// restore cell padding
+					$pdf->setCellPaddings($curentCellPaddinds['L'], $curentCellPaddinds['T'], $curentCellPaddinds['R'], $curentCellPaddinds['B']);
+				}
+			}
+		}
 
-        return $this->tabTitleHeight;
-    }
+		return $this->tabTitleHeight;
+	}
 
 
 
-    /**
-     *  Define Array Column Field for extrafields
-     *
-     *  @param	object			$object    		common object det
-     *  @param	Translate		$outputlangs    langs
-     *  @param	int			   $hidedetails		Do not show line details
-     *  @return	null
-     */
-    public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
-    {
-        global $conf;
+	/**
+	 *  Define Array Column Field for extrafields
+	 *
+	 *  @param	object			$object    		common object det
+	 *  @param	Translate		$outputlangs    langs
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @return	null
+	 */
+	public function defineColumnExtrafield($object, $outputlangs, $hidedetails = 0)
+	{
+		global $conf;
 
-        if (!empty($hidedetails)) {
-            return;
-        }
+		if (!empty($hidedetails)) {
+			return;
+		}
 
-        if (empty($object->table_element)) {
-            return;
-        }
+		if (empty($object->table_element)) {
+			return;
+		}
 
-        // Load extrafiels if not allready does
-        if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
-        if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
-        $extrafields = $this->extrafieldsCache;
+		// Load extrafiels if not allready does
+		if (empty($this->extrafieldsCache)) { $this->extrafieldsCache = new ExtraFields($this->db); }
+		if (empty($this->extrafieldsCache->attributes[$object->table_element])) { $this->extrafieldsCache->fetch_name_optionals_label($object->table_element); }
+		$extrafields = $this->extrafieldsCache;
 
 
-        if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
-            foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
-            {
-                // Dont display separator yet even is set to be displayed (not compatible yet)
-                if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
-                {
-                    continue;
-                }
+		if (!empty($extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label'])) {
+			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label)
+			{
+				// Dont display separator yet even is set to be displayed (not compatible yet)
+				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate')
+				{
+					continue;
+				}
 
-                // Enable extrafield ?
-                $enabled = 0;
-                if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
-                    $printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
-                    if ($printable === 1 || $printable === 2) {
-                        $enabled = 1;
-                    }
-                    // Note : if $printable === 3 or 4 so, it's displayed after line description not in cols
-                }
+				// Enable extrafield ?
+				$enabled = 0;
+				if (!empty($extrafields->attributes[$object->table_element]['printable'][$key])) {
+					$printable = intval($extrafields->attributes[$object->table_element]['printable'][$key]);
+					if ($printable === 1 || $printable === 2) {
+						$enabled = 1;
+					}
+					// Note : if $printable === 3 or 4 so, it's displayed after line description not in cols
+				}
 
-                if (!$enabled) { continue; } // don't wast resourses if we don't need them...
+				if (!$enabled) { continue; } // don't wast resourses if we don't need them...
 
-                // Load language if required
-                if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
+				// Load language if required
+				if (!empty($extrafields->attributes[$object->table_element]['langfile'][$key])) $outputlangs->load($extrafields->attributes[$object->table_element]['langfile'][$key]);
 
-                // TODO : add more extrafield customisation capacities for PDF like width, rank...
+				// TODO : add more extrafield customisation capacities for PDF like width, rank...
 
-                // set column definition
-                $def = array(
-                    'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),
-                    'width' => 25, // in mm
-                    'status' => boolval($enabled),
-                    'title' => array(
-                        'label' => $outputlangs->transnoentities($label)
-                    ),
-                    'content' => array(
-                        'align' => 'C'
-                    ),
-                    'border-left' => true, // add left line separator
-                );
+				// set column definition
+				$def = array(
+					'rank' => intval($extrafields->attributes[$object->table_element]['pos'][$key]),
+					'width' => 25, // in mm
+					'status' => boolval($enabled),
+					'title' => array(
+						'label' => $outputlangs->transnoentities($label)
+					),
+					'content' => array(
+						'align' => 'C'
+					),
+					'border-left' => true, // add left line separator
+				);
 
-                $alignTypeRight = array('double', 'int', 'price');
-                if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeRight)) {
-                    $def['content']['align'] = 'R';
-                }
+				$alignTypeRight = array('double', 'int', 'price');
+				if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeRight)) {
+					$def['content']['align'] = 'R';
+				}
 
-                $alignTypeLeft = array('text', 'html');
-                if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeLeft)) {
-                    $def['content']['align'] = 'L';
-                }
+				$alignTypeLeft = array('text', 'html');
+				if (in_array($extrafields->attributes[$object->table_element]['type'][$key], $alignTypeLeft)) {
+					$def['content']['align'] = 'L';
+				}
 
 
-                // for extrafields we use rank of extrafield to place it on PDF
-                $this->insertNewColumnDef("options_".$key, $def);
-            }
-        }
-    }
+				// for extrafields we use rank of extrafield to place it on PDF
+				$this->insertNewColumnDef("options_".$key, $def);
+			}
+		}
+	}
 }
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 98890744701..920dd42f515 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -815,6 +815,47 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
  */
 abstract class CommonInvoiceLine extends CommonObjectLine
 {
+	/**
+	 * Custom label of line. Not used by default.
+	 * @deprecated
+	 */
+	public $label;
+
+	/**
+	 * @deprecated
+	 * @see $product_ref
+	 */
+	public $ref; // Product ref (deprecated)
+	/**
+	 * @deprecated
+	 * @see $product_label
+	 */
+	public $libelle; // Product label (deprecated)
+
+	/**
+	 * Type of the product. 0 for product 1 for service
+	 * @var int
+	 */
+	public $product_type = 0;
+
+	/**
+	 * Product ref
+	 * @var string
+	 */
+	public $product_ref;
+
+	/**
+	 * Product label
+	 * @var string
+	 */
+	public $product_label;
+
+	/**
+	 * Product description
+	 * @var string
+	 */
+	public $product_desc;
+
 	/**
 	 * Quantity
 	 * @var double
@@ -827,12 +868,6 @@ abstract class CommonInvoiceLine extends CommonObjectLine
 	 */
 	public $subprice;
 
-	/**
-	 * Type of the product. 0 for product 1 for service
-	 * @var int
-	 */
-	public $product_type = 0;
-
 	/**
 	 * Id of corresponding product
 	 * @var int
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 3ea4bba4a7f..ea38df7a826 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -296,6 +296,12 @@ abstract class CommonObject
 	 */
 	public $cond_reglement_id;
 
+    /**
+     * @var int Transport mode ID (For module intracomm report)
+     * @see setTransportMode()
+     */
+    public $transport_mode_id;
+
 	/**
 	 * @var int Payment terms ID
 	 * @deprecated Kept for compatibility
@@ -1999,7 +2005,7 @@ abstract class CommonObject
 				if (get_class($this) == 'Fournisseur') $this->mode_reglement_supplier_id = $id;
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setPaymentMethods Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setPaymentMethods Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2036,7 +2042,7 @@ abstract class CommonObject
 
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setMulticurrencyCode Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setMulticurrencyCode Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2140,7 +2146,7 @@ abstract class CommonObject
 
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setMulticurrencyRate Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setMulticurrencyRate Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2179,7 +2185,7 @@ abstract class CommonObject
 				$this->cond_reglement = $id; // for compatibility
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setPaymentTerms Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setPaymentTerms Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2190,6 +2196,42 @@ abstract class CommonObject
 		}
 	}
 
+    /**
+     *  Change the transport mode methods
+     *
+     *  @param		int		$id		Id of new payment method
+     *  @return		int				>0 if OK, <0 if KO
+     */
+    public function setTransportMode($id)
+    {
+        dol_syslog(get_class($this).'::setTransportMode('.$id.')');
+        if ($this->statut >= 0 || $this->element == 'societe')
+        {
+            $fieldname = 'fk_transport_mode';
+            if ($this->element == 'societe') $fieldname = 'transport_mode';
+            if (get_class($this) == 'Fournisseur') $fieldname = 'transport_mode_supplier';
+
+            $sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+            $sql .= ' SET '.$fieldname.' = '.(($id > 0 || $id == '0') ? $id : 'NULL');
+            $sql .= ' WHERE rowid='.$this->id;
+
+            if ($this->db->query($sql))
+            {
+                $this->transport_mode_id = $id;
+                // for supplier
+                if (get_class($this) == 'Fournisseur') $this->transport_mode_supplier_id = $id;
+                return 1;
+            } else {
+                dol_syslog(get_class($this).'::setTransportMode Error '.$sql.' - '.$this->db->error());
+                $this->error=$this->db->error();
+                return -1;
+            }
+        } else {
+            dol_syslog(get_class($this).'::setTransportMode, status of the object is incompatible');
+            $this->error='Status of the object is incompatible '.$this->statut;
+            return -2;
+        }
+    }
 
 	/**
 	 *  Change the retained warranty payments terms
@@ -2213,7 +2255,7 @@ abstract class CommonObject
 				$this->retained_warranty_fk_cond_reglement = $id;
 				return 1;
 			} else {
-				dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Erreur '.$sql.' - '.$this->db->error());
+				dol_syslog(get_class($this).'::setRetainedWarrantyPaymentTerms Error '.$sql.' - '.$this->db->error());
 				$this->error = $this->db->error();
 				return -1;
 			}
@@ -2245,7 +2287,7 @@ abstract class CommonObject
 			return 1;
 		} else {
 			$this->error = $this->db->error();
-			dol_syslog(get_class($this).'::setDeliveryAddress Erreur '.$sql.' - '.$this->error);
+			dol_syslog(get_class($this).'::setDeliveryAddress Error '.$sql.' - '.$this->error);
 			return -1;
 		}
 	}
@@ -8286,7 +8328,7 @@ abstract class CommonObject
 	 * @param  int		$fromId	Id object source
 	 * @param  int		$toId	Id object cible
 	 * @param  string	$type	Type of category ('product', ...)
-	 * @return int      < 0 si erreur, > 0 si ok
+	 * @return int      < 0 if error, > 0 if ok
 	 */
 	public function cloneCategories($fromId, $toId, $type = '')
 	{
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 83d20e99b95..8874175a138 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -38,6 +38,12 @@ abstract class CommonOrder extends CommonObject
  */
 abstract class CommonOrderLine extends CommonObjectLine
 {
+	/**
+	 * Custom label of line. Not used by default.
+	 * @deprecated
+	 */
+	public $label;
+
 	/**
 	 * Product ref
 	 * @var string
@@ -46,12 +52,6 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 */
 	public $ref;
 
-	/**
-	 * Product ref
-	 * @var string
-	 */
-	public $product_ref;
-
 	/**
 	 * Product label
 	 * @var string
@@ -60,6 +60,12 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 */
 	public $libelle;
 
+	/**
+	 * Product ref
+	 * @var string
+	 */
+	public $product_ref;
+
 	/**
 	 * Product label
 	 * @var string
diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index 32d7b145a41..ce726265006 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -203,7 +203,7 @@ class Conf
 						{
 							$modulename = strtolower($reg[1]);
 							$partname = strtolower($reg[2]);
-							if (!is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
+							if (!isset($this->modules_parts[$partname]) || !is_array($this->modules_parts[$partname])) { $this->modules_parts[$partname] = array(); }
 							$arrValue = json_decode($value, true);
 							if (is_array($arrValue) && !empty($arrValue)) $value = $arrValue;
 							elseif (in_array($partname, array('login', 'menus', 'substitutions', 'triggers', 'tpl'))) $value = '/'.$modulename.'/core/'.$partname.'/';
@@ -235,7 +235,7 @@ class Conf
             $filesList = explode(":", $this->global->LOCAL_CONSTS_FILES);
             foreach ($filesList as $file) {
                 $file = dol_sanitizeFileName($file);
-                include_once DOL_DOCUMENT_ROOT."/".$file."/".$file."_consts.php"; // This file can run code like setting $this->global->XXX vars.
+                dol_include_once($file."/".$file."_consts.php"); // This file can run code like setting $this->global->XXX vars.
             }
         }
 
diff --git a/htdocs/core/class/cproductnature.class.php b/htdocs/core/class/cproductnature.class.php
new file mode 100644
index 00000000000..d098f56d82b
--- /dev/null
+++ b/htdocs/core/class/cproductnature.class.php
@@ -0,0 +1,362 @@
+<?php
+/* Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2020 Florian HENRY <florian.henry@scopen.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/class/cproductnature.class.php
+ *      \ingroup    core
+ *      \brief      This file is CRUD class file (Create/Read/Update/Delete) for c_units dictionary
+ */
+
+
+/**
+ *	Class of dictionary of nature of product (used by imports)
+ */
+class CProductNature // extends CommonObject
+{
+	/**
+     * @var DoliDB Database handler.
+     */
+    public $db;
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
+	public $records = array();
+
+	public $element='cproductnbature';
+	public $table_element='c_product_nature';
+
+    /**
+	 * @var int ID
+	 */
+	public $id;
+
+	public $code;
+	public $label;
+	public $active;
+
+
+
+
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDb		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *  Create object into database
+     *
+     *  @param      User	$user        User that create
+     *  @param      int		$notrigger   0=launch triggers after, 1=disable triggers
+     *  @return     int      		   	 <0 if KO, Id of created object if OK
+     */
+    public function create($user, $notrigger = 0)
+    {
+    	global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+
+		if (isset($this->id)) $this->id = (int) $this->id;
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->label)) $this->libelle = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+        // Insert request
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
+		$sql .= "rowid,";
+		$sql .= "code,";
+		$sql .= "label,";
+		$sql .= "active";
+        $sql .= ") VALUES (";
+		$sql .= " ".(!isset($this->id) ? 'NULL' : ((int) $this->id)) .",";
+		$sql .= " ".(!isset($this->code) ? 'NULL' : ((int) $this->code)).",";
+		$sql .= " ".(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").",";
+		$sql .= " ".(!isset($this->active) ? 'NULL' : ((int) $this->db->escape($this->active))).",";
+		$sql .= ")";
+
+		$this->db->begin();
+
+	   	dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+		if (!$error)
+        {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
+        }
+
+        // Commit or rollback
+        if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+            return $this->id;
+		}
+    }
+
+
+    /**
+     *  Load object in memory from database
+     *
+     *  @param      int		$id    			Id of CUnit object to fetch (rowid)
+     *  @param		string	$code			Code
+     *  @return     int						<0 if KO, >0 if OK
+     */
+    public function fetch($id, $code = '')
+    {
+    	global $langs;
+
+        $sql = "SELECT";
+		$sql .= " t.rowid,";
+		$sql .= " t.code,";
+		$sql .= " t.label,";
+		$sql .= " t.active";
+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+        $sql_where = array();
+        if ($id)   $sql_where[] = " t.rowid = ".$id;
+        if ($code>=0) $sql_where[] = " t.code = ". ((int) $code);
+        if (count($sql_where) > 0) {
+        	$sql .= ' WHERE '.implode(' AND ', $sql_where);
+        }
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            if ($this->db->num_rows($resql))
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id = $obj->rowid;
+				$this->code = $obj->code;
+				$this->label = $obj->label;
+				$this->active = $obj->active;
+            }
+            $this->db->free($resql);
+
+            return 1;
+        } else {
+      	    $this->error = "Error ".$this->db->lasterror();
+            return -1;
+        }
+    }
+
+
+    /**
+     * Load list of objects in memory from the database.
+     *
+     * @param  string      $sortorder    Sort Order
+     * @param  string      $sortfield    Sort field
+     * @param  int         $limit        limit
+     * @param  int         $offset       Offset
+     * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+     * @param  string      $filtermode   Filter mode (AND or OR)
+     * @return array|int                 int <0 if KO, array of pages if OK
+     */
+    public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+    {
+    	global $conf;
+
+    	dol_syslog(__METHOD__, LOG_DEBUG);
+
+    	$sql = 'SELECT';
+    	$sql .= " t.rowid,";
+    	$sql .= " t.code,";
+    	$sql .= " t.label,";
+    	$sql .= " t.active";
+    	$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+    	// Manage filter
+    	$sqlwhere = array();
+    	if (count($filter) > 0) {
+    		foreach ($filter as $key => $value) {
+    			if ($key == 't.rowid' || $key == 't.active' || $key == 't.code') {
+    				$sqlwhere[] = $key.'='.(int) $value;
+    			} elseif (strpos($key, 'date') !== false) {
+    				$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+    			} elseif ($key == 't.label') {
+    				$sqlwhere[] = $key.' = \''.$this->db->escape($value).'\'';
+    			} else {
+    				$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+    			}
+    		}
+    	}
+    	if (count($sqlwhere) > 0) {
+    		$sql .= ' WHERE ('.implode(' '.$filtermode.' ', $sqlwhere).')';
+    	}
+
+    	if (!empty($sortfield)) {
+    		$sql .= $this->db->order($sortfield, $sortorder);
+    	}
+    	if (!empty($limit)) {
+    		$sql .= ' '.$this->db->plimit($limit, $offset);
+    	}
+
+    	$resql = $this->db->query($sql);
+    	if ($resql) {
+    		$this->records = array();
+    		$num = $this->db->num_rows($resql);
+    		if ($num > 0) {
+	    		while ($obj = $this->db->fetch_object($resql))
+	    		{
+	    			$record = new self($this->db);
+
+	    			$record->id    = $obj->rowid;
+	    			$record->code = $obj->code;
+	    			$record->label = $obj->label;
+	    			$this->records[$record->id] = $record;
+	    		}
+    		}
+    		$this->db->free($resql);
+
+    		return $this->records;
+    	} else {
+    		$this->errors[] = 'Error '.$this->db->lasterror();
+    		dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+    		return -1;
+    	}
+    }
+
+
+    /**
+     *  Update object into database
+     *
+     *  @param      User	$user        User that modify
+     *  @param      int		$notrigger	 0=launch triggers after, 1=disable triggers
+     *  @return     int     		   	 <0 if KO, >0 if OK
+     */
+    public function update($user = null, $notrigger = 0)
+    {
+    	global $conf, $langs;
+		$error = 0;
+
+		// Clean parameters
+		if (isset($this->code)) $this->code = trim($this->code);
+		if (isset($this->label)) $this->label = trim($this->label);
+		if (isset($this->active)) $this->active = trim($this->active);
+
+		// Check parameters
+		// Put here code to add control on parameters values
+
+        // Update request
+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET";
+		$sql .= " code=".(isset($this->code) ? ((int) $this->code) : "null").",";
+		$sql .= " label=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
+		$sql .= " active=".(isset($this->active) ? ((int) $this->active) : "null");
+        $sql .= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+        $resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+        // Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+    }
+
+
+ 	/**
+	 *  Delete object in database
+	 *
+     *	@param  User	$user        User that delete
+     *  @param  int		$notrigger	 0=launch triggers after, 1=disable triggers
+	 *  @return	int					 <0 if KO, >0 if OK
+	 */
+	public function delete($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+		$error = 0;
+
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid=".$this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+
+        // Commit or rollback
+		if ($error)
+		{
+			foreach ($this->errors as $errmsg)
+			{
+	            dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 * Get unit from code
+	 * @param string $code code of unit
+	 * @param string $mode 0= id , short_label=Use short label as value, code=use code
+	 * @return int            <0 if KO, Id of code if OK
+	 */
+	public function getProductNatureFromCode($code, $mode = 'code')
+	{
+		if ($mode == 'label') {
+			return dol_getIdFromCode($this->db, $code, $this->table_element, 'label', 'code');
+		} elseif ($mode == 'code'){
+			return dol_getIdFromCode($this->db, $code, $this->table_element, 'code', 'code');
+		}
+
+		return $code;
+	}
+}
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index 0a1686c3585..dee727cb596 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -533,7 +533,7 @@ class DolGraph
 		$vals = array();
 
 		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
+		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
 		for ($j = 0; $j < $nblines; $j++)
 		{
@@ -562,7 +562,7 @@ class DolGraph
 		$vals = array();
 
 		$nblines = count($this->data);
-		$nbvalues = count($this->data[0]) - 1;
+		$nbvalues = (empty($this->data[0]) ? 0 : count($this->data[0]) - 1);
 
 		for ($j = 0; $j < $nblines; $j++)
 		{
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index f8c33f9403a..6cab6580a5a 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -25,32 +25,32 @@
 /*
  * Tags for ticket template
  *
- * <dol_align_left>                                 Left align text
- * <dol_align_center>                               Center text
- * <dol_align_right>                                Right align text
- * <dol_use_font_a>                                 Use font A of printer
- * <dol_use_font_b>                                 Use font B of printer
- * <dol_use_font_c>                                 Use font C of printer
- * <dol_bold>                                       Text Bold
- * <dol_bold_disabled>                              Disable Text Bold
- * <dol_double_height>                              Text double height
- * <dol_double_width>                               Text double width
- * <dol_default_height_width>                       Text default height and width
- * <dol_underline>                                  Underline text
- * <dol_underline_disabled>                         Disable underline text
- * <dol_cut_paper_full>                             Cut ticket completely
- * <dol_cut_paper_partial>                          Cut ticket partially
- * <dol_open_drawer>                                Open cash drawer
- * <dol_beep>                                       Activate buzzer
- * <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_object_lines>                         Print object lines
- * <dol_print_object_tax>                           Print object total tax
- * <dol_print_object_local_tax>                     Print object local tax
- * <dol_print_object_total>                         Print object total
- * <dol_print_order_lines>                          Print order lines for Printer
- * <dol_print_payment>                              Print payment method
+ * {dol_align_left}                                 Left align text
+ * {dol_align_center}                               Center text
+ * {dol_align_right}                                Right align text
+ * {dol_use_font_a}                                 Use font A of printer
+ * {dol_use_font_b}                                 Use font B of printer
+ * {dol_use_font_c}                                 Use font C of printer
+ * {dol_bold}                                       Text Bold
+ * {dol_bold_disabled}                              Disable Text Bold
+ * {dol_double_height}                              Text double height
+ * {dol_double_width}                               Text double width
+ * {dol_default_height_width}                       Text default height and width
+ * {dol_underline}                                  Underline text
+ * {dol_underline_disabled}                         Disable underline text
+ * {dol_cut_paper_full}                             Cut ticket completely
+ * {dol_cut_paper_partial}                          Cut ticket partially
+ * {dol_open_drawer}                                Open cash drawer
+ * {dol_beep}                                       Activate buzzer
+ * {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_object_lines}                         Print object lines
+ * {dol_print_object_tax}                           Print object total tax
+ * {dol_print_object_local_tax}                     Print object local tax
+ * {dol_print_object_total}                         Print object total
+ * {dol_print_order_lines}                          Print order lines for Printer
+ * {dol_print_payment}                              Print payment method
  *
  * Code which can be placed everywhere
  * <dol_value_date>                                 Replaced by date AAAA-MM-DD
@@ -569,45 +569,47 @@ class dolReceiptPrinter extends Printer
         $ret = $this->loadTemplate($templateid);
 
         // 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);
+        $this->template = str_replace('{dol_value_object_id}', $object->id, $this->template);
+        $this->template = str_replace('{dol_value_object_ref}', $object->ref, $this->template);
         //$this->template = str_replace('<dol_value_object_points>', $object->points, $this->template);
-        $this->template = str_replace('<dol_value_date>', dol_print_date($object->date, 'day'), $this->template);
-        $this->template = str_replace('<dol_value_date_time>', dol_print_date($object->date, 'dayhour'), $this->template);
-        $this->template = str_replace('<dol_value_year>', dol_print_date($object->date, '%Y'), $this->template);
-        $this->template = str_replace('<dol_value_month_letters>', $langs->trans("Month".dol_print_date($object->date, '%m')), $this->template);
-        $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_date}', dol_print_date($object->date, 'day'), $this->template);
+        $this->template = str_replace('{dol_value_date_time}', dol_print_date($object->date, 'dayhour'), $this->template);
+        $this->template = str_replace('{dol_value_year}', dol_print_date($object->date, '%Y'), $this->template);
+        $this->template = str_replace('{dol_value_month_letters}', $langs->trans("Month".dol_print_date($object->date, '%m')), $this->template);
+        $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_customer_firstname>', $object->thirdparty->firstname, $this->template);
-        $this->template = str_replace('<dol_value_customer_lastname>', $object->thirdparty->lastname, $this->template);
-        $this->template = str_replace('<dol_value_customer_mail>', $object->thirdparty->email, $this->template);
-        $this->template = str_replace('<dol_value_customer_phone>', $object->thirdparty->phone, $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);
+        $this->template = str_replace('{dol_value_customer_mail}', $object->thirdparty->email, $this->template);
+        $this->template = str_replace('{dol_value_customer_phone}', $object->thirdparty->phone, $this->template);
         //$this->template = str_replace('<dol_value_customer_mobile>', $object->thirdparty->mobile, $this->template);
-        $this->template = str_replace('<dol_value_customer_tax_number>', $object->thirdparty->tva_intra, $this->template);
+        $this->template = str_replace('{dol_value_customer_tax_number}', $object->thirdparty->tva_intra, $this->template);
         //$this->template = str_replace('<dol_value_customer_account_balance>', $object->customer_account_balance, $this->template);
         //$this->template = str_replace('<dol_value_customer_points>', $object->customer_points, $this->template);
 
-        $this->template = str_replace('<dol_value_mysoc_name>', $mysoc->name, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_address>', $mysoc->address, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_zip>', $mysoc->zip, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_town>', $mysoc->town, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_country>', $mysoc->country, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof1>', $mysoc->idprof1, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof2>', $mysoc->idprof2, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof3>', $mysoc->idprof3, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof4>', $mysoc->idprof4, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof5>', $mysoc->idprof5, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_idprof6>', $mysoc->idprof6, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_tva_intra>', $mysoc->tva_intra, $this->template);
-        $this->template = str_replace('<dol_value_mysoc_capital>', $mysoc->capital, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_name}', $mysoc->name, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_address}', $mysoc->address, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_zip}', $mysoc->zip, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_town}', $mysoc->town, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_country}', $mysoc->country, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_idprof1}', $mysoc->idprof1, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_idprof2}', $mysoc->idprof2, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_idprof3}', $mysoc->idprof3, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_idprof4}', $mysoc->idprof4, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_idprof5}', $mysoc->idprof5, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_idprof6}', $mysoc->idprof6, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_tva_intra}', $mysoc->tva_intra, $this->template);
+        $this->template = str_replace('{dol_value_mysoc_capital}', $mysoc->capital, $this->template);
 
-        $this->template = str_replace('<dol_value_vendor_firstname>', $user->firstname, $this->template);
-        $this->template = str_replace('<dol_value_vendor_lastname>', $user->lastname, $this->template);
-        $this->template = str_replace('<dol_value_vendor_mail>', $user->email, $this->template);
+        $this->template = str_replace('{dol_value_vendor_firstname}', $user->firstname, $this->template);
+        $this->template = str_replace('{dol_value_vendor_lastname}', $user->lastname, $this->template);
+        $this->template = str_replace('{dol_value_vendor_mail}', $user->email, $this->template);
 
         // parse template
+		$this->template = str_replace("{", "<", $this->template);
+		$this->template = str_replace("}", ">", $this->template);
         $p = xml_parser_create();
         xml_parse_into_struct($p, $this->template, $vals, $index);
         xml_parser_free($p);
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index 934c8d424a4..3c094ff5a6b 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -30,9 +30,9 @@
 class HookManager
 {
 	/**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
 	/**
 	 * @var string Error code (or message)
@@ -44,18 +44,18 @@ class HookManager
 	 */
 	public $errors = array();
 
-    // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
-    public $contextarray = array();
+	// Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
+	public $contextarray = array();
 
 	// Array with instantiated classes
-    public $hooks = array();
+	public $hooks = array();
 
 	// Array result
-    public $resArray = array();
+	public $resArray = array();
 	// Printable result
-    public $resPrint = '';
+	public $resPrint = '';
 	// Nb of qualified hook ran
-    public $resNbOfHooks = 0;
+	public $resNbOfHooks = 0;
 
 	/**
 	 * Constructor
@@ -84,9 +84,9 @@ class HookManager
 		global $conf;
 
 		// Test if there is hooks to manage
-        if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+		if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
 
-        // For backward compatibility
+		// For backward compatibility
 		if (!is_array($arraycontext)) $arraycontext = array($arraycontext);
 
 		$this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
@@ -130,29 +130,29 @@ class HookManager
 		return 1;
 	}
 
-    /**
-     *  Execute hooks (if they were initialized) for the given method
-     *
-     *  @param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
-     *  @param		array	$parameters		Array of parameters
-     *  @param		Object	$object			Object to use hooks on
-     *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
-     *  @return		mixed					For 'addreplace' hooks (doActions, formConfirm, formObjectOptions, pdf_xxx,...): 	Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-     *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-     *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
-     *                                      $this->error or this->errors are also defined by class called by this function if error.
-     */
+	/**
+	 *  Execute hooks (if they were initialized) for the given method
+	 *
+	 *  @param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
+	 *  @param		array	$parameters		Array of parameters
+	 *  @param		Object	$object			Object to use hooks on
+	 *  @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
+	 *  @return		mixed					For 'addreplace' hooks (doActions, formConfirm, formObjectOptions, pdf_xxx,...): 	Return 0 if we want to keep standard actions, >0 if we want to stop/replace standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 *                                      For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 *                                      All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
+	 *                                      $this->error or this->errors are also defined by class called by this function if error.
+	 */
 	public function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
 	{
-        if (!is_array($this->hooks) || empty($this->hooks)) return 0;	// No hook available, do nothing.
+		if (!is_array($this->hooks) || empty($this->hooks)) return 0;	// No hook available, do nothing.
 
-        $parameters['context'] = join(':', $this->contextarray);
-        //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
+		$parameters['context'] = join(':', $this->contextarray);
+		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
-        // Define type of hook ('output' or 'addreplace').
-        // TODO Remove hooks with type 'output'. All hooks must be converted into 'addreplace' hooks.
-        $hooktype = 'output';
-        if (in_array(
+		// Define type of hook ('output' or 'addreplace').
+		// TODO Remove hooks with type 'output'. All hooks must be converted into 'addreplace' hooks.
+		$hooktype = 'output';
+		if (in_array(
 			$method,
 			array(
 				'addCalendarChoice',
@@ -172,33 +172,33 @@ class HookManager
 				'formattachOptions',
 				'formBuilddocLineOptions',
 				'formatNotificationMessage',
-			    'formConfirm',
+				'formConfirm',
 				'getAccessForbiddenMessage',
 				'getDirList',
 				'getFormMail',
 				'getFormatedCustomerRef',
-			    'getFormatedSupplierRef',
+				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
 				'moveUploadedFile',
 				'moreHtmlStatus',
 				'pdf_build_address',
 				'pdf_writelinedesc',
-			    'pdf_getlinenum',
-			    'pdf_getlineref',
-			    'pdf_getlineref_supplier',
-			    'pdf_getlinevatrate',
-			    'pdf_getlineupexcltax',
-			    'pdf_getlineupwithtax',
-			    'pdf_getlineqty',
-			    'pdf_getlineqty_asked',
-			    'pdf_getlineqty_shipped',
-			    'pdf_getlineqty_keeptoship',
-			    'pdf_getlineunit',
-			    'pdf_getlineremisepercent',
-			    'pdf_getlineprogress',
-			    'pdf_getlinetotalexcltax',
-			    'pdf_getlinetotalwithtax',
+				'pdf_getlinenum',
+				'pdf_getlineref',
+				'pdf_getlineref_supplier',
+				'pdf_getlinevatrate',
+				'pdf_getlineupexcltax',
+				'pdf_getlineupwithtax',
+				'pdf_getlineqty',
+				'pdf_getlineqty_asked',
+				'pdf_getlineqty_shipped',
+				'pdf_getlineqty_keeptoship',
+				'pdf_getlineunit',
+				'pdf_getlineremisepercent',
+				'pdf_getlineprogress',
+				'pdf_getlinetotalexcltax',
+				'pdf_getlinetotalwithtax',
 				'paymentsupplierinvoices',
 				'printAddress',
 				'printEmail',
@@ -213,88 +213,88 @@ class HookManager
 				'showLinkToObjectBlock',
 				'setContentSecurityPolicy',
 				'setHtmlTitle',
-                'completeTabsHead'
+				'completeTabsHead'
 				)
 			)) $hooktype = 'addreplace';
 
-        // Init return properties
-        $this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
+		// Init return properties
+		$this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
 
-        // Loop on each hook to qualify modules that have declared context
-        $modulealreadyexecuted = array();
-        $resaction = 0; $error = 0;
-        foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
-        {
-            if (!empty($modules))
-            {
-                foreach ($modules as $module => $actionclassinstance)
-                {
-                	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
+		// Loop on each hook to qualify modules that have declared context
+		$modulealreadyexecuted = array();
+		$resaction = 0; $error = 0;
+		foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+		{
+			if (!empty($modules))
+			{
+				foreach ($modules as $module => $actionclassinstance)
+				{
+					//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
 
-                    // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module, $modulealreadyexecuted)) continue;
+					// test to avoid running twice a hook, when a module implements several active contexts
+					if (in_array($module, $modulealreadyexecuted)) continue;
 
-                	// jump to next module/class if method does not exist
-                    if (!method_exists($actionclassinstance, $method)) continue;
+					// jump to next module/class if method does not exist
+					if (!method_exists($actionclassinstance, $method)) continue;
 
-                    $this->resNbOfHooks++;
+					$this->resNbOfHooks++;
 
-                    $modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
+					$modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
 
-                    // Clean class (an error may have been set from a previous call of another method for same module/hook)
-                    $actionclassinstance->error = 0;
-                    $actionclassinstance->errors = array();
+					// Clean class (an error may have been set from a previous call of another method for same module/hook)
+					$actionclassinstance->error = 0;
+					$actionclassinstance->errors = array();
 
-                    dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
+					dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
 
-                    // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
-                    $parameters['currentcontext'] = $context;
-                    // Hooks that must return int (hooks with type 'addreplace')
-                    if ($hooktype == 'addreplace')
-                    {
-                    	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-                    	if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
-                    	{
-                    		$error++;
-                    		$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
-                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
-                    	}
+					// Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
+					$parameters['currentcontext'] = $context;
+					// Hooks that must return int (hooks with type 'addreplace')
+					if ($hooktype == 'addreplace')
+					{
+						$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
+						{
+							$error++;
+							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
+							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
+						}
 
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
-                    }
-                    // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
-                    else {
-                    	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
+					}
+					// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
+					else {
+						// TODO. this test should be done into the method of hook by returning nothing
+						if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
-                    	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-                    	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
+						$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-                    	if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
-                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
-                    	if (is_numeric($resaction) && $resaction < 0)
-                    	{
-                    	    $error++;
-                    	    $this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
-                    	    dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
-                    	}
-                    	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-                    	if (!is_array($resaction) && !is_numeric($resaction))
-                    	{
-                    		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
-                    	}
-                    }
+						if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+						if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
+						if (is_numeric($resaction) && $resaction < 0)
+						{
+							$error++;
+							$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
+							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
+						}
+						// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
+						if (!is_array($resaction) && !is_numeric($resaction))
+						{
+							dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
+							if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
+						}
+					}
 
-                    //print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
+					//print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction."<br>\n";
 
-                    unset($actionclassinstance->results);
-                    unset($actionclassinstance->resprints);
-                }
-            }
-        }
+					unset($actionclassinstance->results);
+					unset($actionclassinstance->resprints);
+				}
+			}
+		}
 
-        return ($error ? -1 : $resaction);
+		return ($error ? -1 : $resaction);
 	}
 }
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3f4938360e0..4b8a64a0851 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -71,6 +71,7 @@ class Form
 	// Cache arrays
 	public $cache_types_paiements = array();
 	public $cache_conditions_paiements = array();
+	public $cache_transport_mode = array();
 	public $cache_availability = array();
 	public $cache_demand_reason = array();
 	public $cache_types_fees = array();
@@ -263,6 +264,7 @@ class Form
 				elseif (preg_match('/^(amount|numeric)/', $typeofdata)) $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
 				elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))  $ret .= dol_htmlentitiesbr($value);
 				elseif (preg_match('/^safehtmlstring/', $typeofdata)) $ret .= dol_string_onlythesehtmltags($value);
+				elseif (preg_match('/^restricthtml/', $typeofdata)) $ret .= dol_string_onlythesehtmltags($value);
 				elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret .= dol_print_date($value, 'day');
 				elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret .= dol_print_date($value, 'dayhour');
 				elseif (preg_match('/^select;/', $typeofdata))
@@ -809,7 +811,7 @@ class Form
 					$out .= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';
 					if ($mysoc->isInEEC()) $out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';
 					$out .= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';
-					$out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
+					$out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>';
 				}
 
 				foreach ($countryArray as $row)
@@ -822,7 +824,7 @@ class Form
 					if (empty($row['favorite']) && $atleastonefavorite)
 					{
 						$atleastonefavorite = 0;
-						$out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';
+						$out .= '<option value="" disabled class="selectoptiondisabledwhite">------------</option>';
 					}
 					if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label']))
 					{
@@ -1083,25 +1085,6 @@ class Form
 	}
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return HTML code to select a company.
-	 *
-	 *  @param		int			$selected				Preselected products
-	 *  @param		string		$htmlname				Name of HTML select field (must be unique in page)
-	 *  @param		int			$filter					Filter on thirdparty
-	 *  @param		int			$limit					Limit on number of returned lines
-	 *  @param		array		$ajaxoptions			Options for ajax_autocompleter
-	 * 	@param		int			$forcecombo				Force to load all values and output a standard combobox (with no beautification)
-	 *  @return		string								Return select box for thirdparty.
-	 *  @deprecated	3.8 Use select_company instead. For exemple $form->select_thirdparty(GETPOST('socid'),'socid','',0) => $form->select_company(GETPOST('socid'),'socid','',1,0,0,array(),0)
-	 */
-	public function select_thirdparty($selected = '', $htmlname = 'socid', $filter = '', $limit = 20, $ajaxoptions = array(), $forcecombo = 0)
-	{
-		// phpcs:enable
-		return $this->select_thirdparty_list($selected, $htmlname, $filter, 1, 0, $forcecombo, array(), '', 0, $limit);
-	}
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Output html form to select a third party
@@ -1205,17 +1188,15 @@ class Form
 
 		// On recherche les societes
 		$sql = "SELECT s.rowid, s.nom as name, s.name_alias, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
-
 		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
 			$sql .= ", s.address, s.zip, s.town";
 			$sql .= ", dictp.code as country_code";
 		}
-
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
-			$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid = s.fk_pays";
 		}
+		if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		$sql .= " WHERE s.entity IN (".getEntity('societe').")";
 		if (!empty($user->socid)) $sql .= " AND s.rowid = ".$user->socid;
 		if ($filter) $sql .= " AND (".$filter.")";
@@ -1268,7 +1249,7 @@ class Form
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 				else $textifempty .= $langs->trans("All");
 			}
-			if ($showempty) $out .= '<option value="-1">'.$textifempty.'</option>'."\n";
+			if ($showempty) $out .= '<option value="-1" data-html="'.dol_escape_htmltag('<span class="opacitymedium">'.$textifempty.'</span>').'">'.$textifempty.'</option>'."\n";
 
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -1303,10 +1284,10 @@ class Form
 						if ($obj->client || $obj->fournisseur) $label .= ')';
 					}
 
-					if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
-						$label .= '-'.$obj->address.'-'.$obj->zip.' '.$obj->town;
+					if (! empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
+						$label .= ($obj->address ? ' - '.$obj->address : '').($obj->zip ? ' - '.$obj->zip : '').($obj->town ? ' '.$obj->town : '');
 						if (!empty($obj->country_code)) {
-							$label .= ' '.$langs->trans('Country'.$obj->country_code);
+							$label .= ', '.$langs->trans('Country'.$obj->country_code);
 						}
 					}
 
@@ -1665,7 +1646,7 @@ class Form
 		$outarray = array();
 
 		// Forge request to select users
-		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut, u.login, u.admin, u.entity";
+		$sql = "SELECT DISTINCT u.rowid, u.lastname as lastname, u.firstname, u.statut as status, u.login, u.admin, u.entity, u.photo";
 		if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity)
 		{
 			$sql .= ", e.label";
@@ -1729,6 +1710,10 @@ class Form
 					$userstatic->id = $obj->rowid;
 					$userstatic->lastname = $obj->lastname;
 					$userstatic->firstname = $obj->firstname;
+					$userstatic->photo = $obj->photo;
+					$userstatic->statut = $obj->status;
+					$userstatic->entity = $obj->entity;
+					$userstatic->admin = $obj->admin;
 
 					$disableline = '';
 					if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) $disableline = ($enableonlytext ? $enableonlytext : '1');
@@ -1751,11 +1736,11 @@ class Form
 					}
 					if ($showstatus >= 0)
 					{
-						if ($obj->statut == 1 && $showstatus == 1)
+						if ($obj->status == 1 && $showstatus == 1)
 						{
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
 						}
-						if ($obj->statut == 0 && $showstatus == 1)
+						if ($obj->status == 0 && $showstatus == 1)
 						{
 							$moreinfo .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
 						}
@@ -1781,10 +1766,17 @@ class Form
 					if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected))) {
 						$out .= ' selected';
 					}
-					if ($showstatus >= 0 && $obj->statut == 0) {
-						$out .= ' data-html="'.dol_escape_htmltag('<strike class="opacitymediumxxx">'.$labeltoshow.'</strike>').'"';
+					$out .= ' data-html="';
+					$outhtml = '';
+					if (!empty($obj->photo))
+					{
+						$outhtml .= $userstatic->getNomUrl(-3, '', 0, 1, 24, 1, 'login', '', 1).' ';
 					}
-					$out .= '>';
+					if ($showstatus >= 0 && $obj->status == 0) $outhtml .= '<strike class="opacitymediumxxx">';
+					$outhtml .= $labeltoshow;
+					if ($showstatus >= 0 && $obj->status == 0) $outhtml .= '</strike>';
+					$out .= dol_escape_htmltag($outhtml);
+					$out .= '">';
 					$out .= $labeltoshow;
 					$out .= '</option>';
 
@@ -1866,7 +1858,7 @@ class Form
 				if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid)))
 				{
 					$out .= '<div class="myavailability inline-block">';
-					$out .= '&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  <input id="transparency" class="marginleftonly marginrightonly" '.($action == 'view' ? 'disabled' : '').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency'] ? ' checked' : '').'>'.$langs->trans("Busy");
+					$out .= '<span class="hideonsmartphone">&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  </span><input id="transparency" class="paddingrightonly" '.($action == 'view' ? 'disabled' : '').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency'] ? ' checked' : '').'><label for="transparency">'.$langs->trans("Busy").'</label>';
 					$out .= '</div>';
 				}
 			}
@@ -1882,9 +1874,15 @@ class Form
 		if ($action != 'view')
 		{
 			$out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';
-			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';
+			$out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {';
+			$out .= 'jQuery(".removedassigned").click(function() { jQuery(".removedassignedhidden").val(jQuery(this).val()); });';
+			$out .= 'jQuery(".assignedtouser").change(function() { console.log(jQuery(".assignedtouser option:selected").val());';
+			$out .= ' if (jQuery(".assignedtouser option:selected").val() > 0) { jQuery("#'.$action.'assignedtouser").attr("disabled", false); }';
+			$out .= ' else { jQuery("#'.$action.'assignedtouser").attr("disabled", true); }';
+			$out .= '});';
+			$out .= '})</script>';
 			$out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);
-			$out .= ' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+			$out .= ' <input type="submit" disabled class="button valignmiddle" id="'.$action.'assignedtouser" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
 			$out .= '<br>';
 		}
 
@@ -3282,6 +3280,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox($htmlname);
 	}
 
 	/**
@@ -3365,6 +3364,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox('select_'.$htmlname);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -3460,6 +3460,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin && empty($noinfoadmin)) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox($htmlname);
 	}
 
 
@@ -3529,6 +3530,7 @@ class Form
 		}
 		print '</select>';
 		if ($user->admin && !$noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		print ajax_combobox('select'.$htmlname);
 	}
 
 
@@ -3565,6 +3567,107 @@ class Form
 		return $return;
 	}
 
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    /**
+     *      Load in cache list of transport mode
+     *
+     *      @return     int                 Nb of lines loaded, <0 if KO
+     */
+    public function load_cache_transport_mode()
+    {
+        // phpcs:enable
+        global $langs;
+
+        $num=count($this->cache_transport_mode);
+        if ($num > 0) return $num;    // Cache already loaded
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $this->cache_transport_mode = array();
+
+        $sql = "SELECT rowid, code, label, active";
+        $sql.= " FROM ".MAIN_DB_PREFIX."c_transport_mode";
+        $sql.= " WHERE entity IN (".getEntity('c_transport_mode').")";
+        //if ($active >= 0) $sql.= " AND active = ".$active;
+
+        $resql = $this->db->query($sql);
+        if ($resql)
+        {
+            $num = $this->db->num_rows($resql);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($resql);
+
+                // If traduction exist, we use it else we take the default label
+                $label=($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code)!=("PaymentTypeShort".$obj->code)?$langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code):($obj->label!='-'?$obj->label:''));
+                $this->cache_transport_mode[$obj->rowid]['rowid'] = $obj->rowid;
+                $this->cache_transport_mode[$obj->rowid]['code'] = $obj->code;
+                $this->cache_transport_mode[$obj->rowid]['label']= $label;
+                $this->cache_transport_mode[$obj->rowid]['active'] = $obj->active;
+                $i++;
+            }
+
+            $this->cache_transport_mode = dol_sort_array($this->cache_transport_mode, 'label', 'asc', 0, 0, 1);
+
+            return $num;
+        }
+        else {
+            dol_print_error($this->db);
+            return -1;
+        }
+    }
+
+    /**
+     *      Return list of transport mode for intracomm report
+     *
+     *      @param	string	$selected       Id of the transport mode pre-selected
+     *      @param  string	$htmlname       Name of the select field
+     *      @param  int		$format         0=id+label, 1=code+code, 2=code+label, 3=id+code
+     *      @param  int		$empty			1=can be empty, 0 else
+     *      @param	int		$noadmininfo	0=Add admin info, 1=Disable admin info
+     *      @param  int		$maxlength      Max length of label
+     *      @param  int     $active         Active or not, -1 = all
+     *      @param  string  $morecss        Add more CSS on select tag
+     * 		@return	void
+     */
+    public function selectTransportMode($selected = '', $htmlname = 'transportmode', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '')
+    {
+        global $langs,$user;
+
+        dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$format, LOG_DEBUG);
+
+        $this->load_cache_transport_mode();
+
+        print '<select id="select'.$htmlname.'" class="flat selectmodetransport'.($morecss?' '.$morecss:'').'" name="'.$htmlname.'">';
+        if ($empty) print '<option value="">&nbsp;</option>';
+        foreach ($this->cache_transport_mode as $id => $arraytypes)
+        {
+            // If not good status
+            if ($active >= 0 && $arraytypes['active'] != $active) continue;
+
+            // We discard empty line if showempty is on because an empty line has already been output.
+            if ($empty && empty($arraytypes['code'])) continue;
+
+            if ($format == 0) print '<option value="'.$id.'"';
+            elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
+            elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
+            elseif ($format == 3) print '<option value="'.$id.'"';
+            // If text is selected, we compare with code, else with id
+            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
+            elseif ($selected == $id) print ' selected';
+            print '>';
+            if ($format == 0) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
+            elseif ($format == 1) $value=$arraytypes['code'];
+            elseif ($format == 2) $value=($maxlength?dol_trunc($arraytypes['label'], $maxlength):$arraytypes['label']);
+            elseif ($format == 3) $value=$arraytypes['code'];
+            print $value?$value:'&nbsp;';
+            print '</option>';
+        }
+        print '</select>';
+        if ($user->admin && ! $noadmininfo) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+    }
+
 	/**
 	 *  Return a HTML select list of shipping mode
 	 *
@@ -3611,6 +3714,8 @@ class Form
 				}
 				print "</select>";
 				if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+
+				print ajax_combobox('select'.$htmlname);
 			} else {
 				print $langs->trans("NoShippingMethodDefined");
 			}
@@ -3809,6 +3914,7 @@ class Form
 					$i++;
 				}
 				print "</select>";
+				print ajax_combobox('select'.$htmlname);
 			} else {
 				if ($status == 0) print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';
 				else print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';
@@ -4128,10 +4234,11 @@ class Form
 							$more .= '<div class="tagtr">';
 							if ($i == 0) $more .= '<div class="tagtd'.(empty($input['tdclass']) ? ' tdtop' : (' tdtop '.$input['tdclass'])).'">'.$input['label'].'</div>';
 							else $more .= '<div clas="tagtd'.(empty($input['tdclass']) ? '' : (' "'.$input['tdclass'])).'">&nbsp;</div>';
-							$more .= '<div class="tagtd"><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
+							$more .= '<div class="tagtd'.($i == 0 ? ' tdtop' : '').'"><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].$selkey.'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;
 							if ($input['disabled']) $more .= ' disabled';
+							if (isset($input['default']) && $input['default'] === $selkey) $more .= ' checked="checked"';
 							$more .= ' /> ';
-							$more .= $selval;
+							$more .= '<label for="'.$input['name'].$selkey.'">'.$selval.'</label>';
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
@@ -4598,7 +4705,40 @@ class Form
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    /**
+     *    Show form with transport mode
+     *
+     *    @param	string	$page        	Page
+     *    @param    int		$selected    	Id mode pre-select
+     *    @param    string	$htmlname    	Name of select html field
+     *    @param    int     $active         Active or not, -1 = all
+     *    @param    int     $addempty       1=Add empty entry
+     *    @return	void
+     */
+    public function formSelectTransportMode($page, $selected = '', $htmlname = 'transport_mode_id', $active = 1, $addempty = 0)
+    {
+        global $langs;
+        if ($htmlname != "none")
+        {
+            print '<form method="POST" action="'.$page.'">';
+            print '<input type="hidden" name="action" value="setmode">';
+            print '<input type="hidden" name="token" value="'.newToken().'">';
+            $this->selectTransportMode($selected, $htmlname, 2, $addempty, 0, 0, $active);
+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+            print '</form>';
+        }
+        else {
+            if ($selected)
+            {
+                $this->load_cache_transport_mode();
+                print $this->cache_transport_mode[$selected]['label'];
+            } else {
+                print "&nbsp;";
+            }
+        }
+    }
+
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *    Show form with multicurrency code
 	 *
@@ -5315,6 +5455,7 @@ class Form
 		}
 
 		// Analysis of the pre-selection date
+		$reg = array();
 		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg))	// deprecated usage
 		{
 			// Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
@@ -5459,7 +5600,6 @@ class Form
 			}
 			// Show date with combo selects
 			else {
-				//$retstring.='<div class="inline-block">';
 				// Day
 				$retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';
 
@@ -5503,11 +5643,13 @@ class Form
 					}
 					$retstring .= "</select>\n";
 				}
-				//$retstring.='</div>';
 			}
 		}
 
-		if ($d && $h) $retstring .= ($h == 2 ? '<br>' : ' ');
+		if ($d && $h) {
+			$retstring .= ($h == 2 ? '<br>' : ' ');
+			$retstring.='<span class="nowraponall">';
+		}
 
 		if ($h)
 		{
@@ -5525,10 +5667,13 @@ class Form
 			for ($hour = $hourstart; $hour < $hourend; $hour++)
 			{
 				if (strlen($hour) < 2) $hour = "0".$hour;
-				$retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour.(empty($conf->dol_optimize_smallscreen) ? '' : 'H').'</option>';
+				$retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour;
+				//$retstring .= (empty($conf->dol_optimize_smallscreen) ? '' : 'H');
+				$retstring .= '</option>';
 			}
 			$retstring .= '</select>';
-			if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
+			//if ($m && empty($conf->dol_optimize_smallscreen)) $retstring .= ":";
+			if ($m) $retstring .= ":";
 		}
 
 		if ($m)
@@ -5546,6 +5691,10 @@ class Form
 			$retstring .= '<input type="hidden" name="'.$prefix.'sec" value="'.$ssec.'">';
 		}
 
+		if ($d && $h) {
+			$retstring .= '</span>';
+		}
+
 		// Add a "Now" link
 		if ($conf->use_javascript_ajax && $addnowlink)
 		{
@@ -5807,7 +5956,7 @@ class Form
 	 * @param	int				$disabled			1=Html component is disabled
 	 * @param	string	        $selected_input_value	Value of preselected input text (for use with ajax)
 	 * @return	string								Return HTML string
-	 * @see selectForFormsList() select_thirdparty()
+	 * @see selectForFormsList() select_thirdparty_list()
 	 */
 	public function selectForForms($objectdesc, $htmlname, $preselectedvalue, $showempty = '', $searchkey = '', $placeholder = '', $morecss = '', $moreparams = '', $forcecombo = 0, $disabled = 0, $selected_input_value = '')
 	{
@@ -6982,9 +7131,10 @@ class Form
 	 *	@param	int			$option			0 return yes/no, 1 return 1/0
 	 *	@param	bool		$disabled		true or false
 	 *  @param	int      	$useempty		1=Add empty line
+	 *  @param	int			$addjscombo		1=Add js beautifier on combo box
 	 *	@return	string						See option
 	 */
-	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
+	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0)
 	{
 		global $langs;
 
@@ -7009,6 +7159,11 @@ class Form
 			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
 		}
 		$resultyesno .= '</select>'."\n";
+
+		if ($addjscombo) {
+			$resultyesno .= ajax_combobox($htmlname);
+		}
+
 		return $resultyesno;
 	}
 
@@ -7138,7 +7293,7 @@ class Form
 		}
 		if ($morehtml)
 		{
-			$ret .= '<li class="noborder litext">'.$morehtml.'</li>';
+			$ret .= '<li class="noborder litext'.(($shownav && $previous_ref && $next_ref) ? ' clearbothonsmartphone' : '').'">'.$morehtml.'</li>';
 		}
 		if ($shownav && ($previous_ref || $next_ref))
 		{
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index b43df3753dc..f6e412e0958 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -375,7 +375,7 @@ class FormCompany extends Form
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			print '<select class="flat" name="'.$htmlname.'">';
+			print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -407,6 +407,7 @@ class FormCompany extends Form
 				}
 			}
 			print '</select>';
+			print ajax_combobox($htmlname);
 		} else {
 			dol_print_error($this->db);
 		}
@@ -1003,6 +1004,7 @@ class FormCompany extends Form
 			}
 		}
 		$out .= '</select>';
+		$out .= ajax_combobox($htmlidname);
 
 		return $out;
 	}
diff --git a/htdocs/core/class/html.formexpensereport.class.php b/htdocs/core/class/html.formexpensereport.class.php
index e8079b77ed6..516c6e4b59c 100644
--- a/htdocs/core/class/html.formexpensereport.class.php
+++ b/htdocs/core/class/html.formexpensereport.class.php
@@ -65,7 +65,7 @@ class FormExpenseReport
 
     	$tmpep = new ExpenseReport($this->db);
 
-    	print '<select class="flat" name="'.$htmlname.'">';
+    	print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
     	if ($useempty) print '<option value="-1">&nbsp;</option>';
     	$arrayoflabels = $tmpep->statuts;
     	if ($useshortlabel) $arrayoflabels = $tmpep->statuts_short;
@@ -81,6 +81,7 @@ class FormExpenseReport
     		print '</option>';
     	}
     	print '</select>';
+    	print ajax_combobox($htmlname);
     }
 
     /**
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index 2b98bac30c6..464dbafa375 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -115,7 +115,7 @@ class FormFile
 			if (empty($usewithoutform))		// Try to avoid this and set instead the form by the caller.
 			{
 				// Add a param as GET parameter to detect when POST were cleaned by PHP because a file larger than post_max_size
-				$url .= (strpos('?', $url) === false ? '?' : '&').'uploadform=1';
+				$url .= (strpos($url, '?') === false ? '?' : '&').'uploadform=1';
 
 				$out .= '<form name="'.$htmlname.'" id="'.$htmlname.'" action="'.$url.'" enctype="multipart/form-data" method="POST">';
 				$out .= '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index e2749c5e183..200b50cd512 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -296,6 +296,7 @@ class FormMail extends Form
 	 *	@param	string	$addfileaction		Name of action when posting file attachments
 	 *	@param	string	$removefileaction	Name of action when removing file attachments
 	 *	@return	void
+	 *  @deprecated
 	 */
 	public function show_form($addfileaction = 'addfile', $removefileaction = 'removefile')
 	{
@@ -434,18 +435,20 @@ class FormMail extends Form
 				{
 					setEventMessages($this->error, $this->errors, 'errors');
 				}
+				$langs->trans("members");
 				foreach ($this->lines_model as $line)
 				{
-					$langs->trans("members");
-					if (preg_match('/\((.*)\)/', $line->label, $reg))
-					{
-						$modelmail_array[$line->id] = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
+					$reg = array();
+					if (preg_match('/\((.*)\)/', $line->label, $reg)) {
+						$labeltouse = $langs->trans($reg[1]); // langs->trans when label is __(xxx)__
 					} else {
-						$modelmail_array[$line->id] = $line->label;
+						$labeltouse = $line->label;
 					}
-					if ($line->lang) $modelmail_array[$line->id] .= ' ('.$line->lang.')';
-					if ($line->private) $modelmail_array[$line->id] .= ' - '.$langs->trans("Private");
-					//if ($line->fk_user != $user->id) $modelmail_array[$line->id].=' - '.$langs->trans("By").' ';
+
+					// We escape the $labeltouse to store it into $modelmail_array.
+					$modelmail_array[$line->id] = dol_escape_htmltag($labeltouse);
+					if ($line->lang) $modelmail_array[$line->id] .= ' '.picto_from_langcode($line->lang);
+					if ($line->private) $modelmail_array[$line->id] .= ' - <span class="opacitymedium">'.dol_escape_htmltag($langs->trans("Private")).'</span>';
 				}
 			}
 
@@ -454,7 +457,8 @@ class FormMail extends Form
 			{
 				// If list of template is filled
 				$out .= '<div class="center" style="padding: 0px 0 12px 0">'."\n";
-				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> '.$this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100');
+				$out .= '<span class="opacitymedium">'.$langs->trans('SelectMailModel').':</span> ';
+				$out .= $this->selectarray('modelmailselected', $modelmail_array, 0, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100', 1, '', 0, 1);
 				if ($user->admin) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFrom", $langs->transnoentitiesnoconv('Setup').' - '.$langs->transnoentitiesnoconv('EMails')), 1);
 				$out .= ' &nbsp; ';
 				$out .= '<input class="button" type="submit" value="'.$langs->trans('Apply').'" name="modelselected" id="modelselected">';
diff --git a/htdocs/core/class/html.formorder.class.php b/htdocs/core/class/html.formorder.class.php
index d3dbe27ceac..1dcac0023c4 100644
--- a/htdocs/core/class/html.formorder.class.php
+++ b/htdocs/core/class/html.formorder.class.php
@@ -62,7 +62,7 @@ class FormOrder extends Form
 		    $options[$value] = $tmpsupplierorder->getLibStatut($short);
 	    }
 
-	    print Form::selectarray($hmlname, $options, $selected, 1);
+	    print Form::selectarray($hmlname, $options, $selected, 1, 0, 0, '', 0, 0, 0, '', '', 1);
     }
 
 	/**
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index a6c458fc67b..5d3bd181753 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -38,738 +38,746 @@
  */
 class FormOther
 {
-    private $db;
+	private $db;
 
-    /**
+	/**
 	 * @var string Error code (or message)
 	 */
 	public $error;
 
 
-    /**
-     *	Constructor
-     *
-     *	@param	DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-    }
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return HTML select list of export models
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Nom de la zone select
-     *    @param    string	$type              Type des modeles recherches
-     *    @param    int		$useempty          Show an empty value in list
-     *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
-     *    @return	void
-     */
-    public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
-    {
-        // phpcs:enable
-        global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return HTML select list of export models
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Nom de la zone select
+	 *    @param    string	$type              Type des modeles recherches
+	 *    @param    int		$useempty          Show an empty value in list
+	 *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
+	 *    @return	void
+	 */
+	public function select_export_model($selected = '', $htmlname = 'exportmodelid', $type = '', $useempty = 0, $fk_user = null)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-    	$sql = "SELECT rowid, label, fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."export_model";
-        $sql .= " WHERE type = '".$this->db->escape($type)."'";
+		$sql = "SELECT rowid, label, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."export_model";
+		$sql .= " WHERE type = '".$this->db->escape($type)."'";
 		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
-        $sql .= " ORDER BY label";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                print '<option value="-1">&nbsp;</option>';
-            }
+		$sql .= " ORDER BY label";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				print '<option value="-1">&nbsp;</option>';
+			}
 
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $label = $obj->label;
-                if ($obj->fk_user == 0) {
-                	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                } elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
-                	$tmpuser = new User($this->db);
-                	$tmpuser->fetch($obj->fk_user);
-                	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
-                }
+				$label = $obj->label;
+				if ($obj->fk_user == 0) {
+					$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
+				} elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+					$tmpuser = new User($this->db);
+					$tmpuser->fetch($obj->fk_user);
+					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
+				}
 
-                if ($selected == $obj->rowid)
-                {
-                    print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                } else {
-                    print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
-                }
-                print $label;
-                print '</option>';
-                $i++;
-            }
-            print "</select>";
-            print ajax_combobox($htmlname);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+				if ($selected == $obj->rowid)
+				{
+					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
+				} else {
+					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
+				}
+				print $label;
+				print '</option>';
+				$i++;
+			}
+			print "</select>";
+			print ajax_combobox($htmlname);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of export models
-     *
-     *    @param    string	$selected          Id modele pre-selectionne
-     *    @param    string	$htmlname          Nom de la zone select
-     *    @param    string	$type              Type des modeles recherches
-     *    @param    int		$useempty          Affiche valeur vide dans liste
-     *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
-     *    @return	void
-     */
-    public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)
-    {
-        // phpcs:enable
-    	global $conf, $langs, $user;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of export models
+	 *
+	 *    @param    string	$selected          Id modele pre-selectionne
+	 *    @param    string	$htmlname          Nom de la zone select
+	 *    @param    string	$type              Type des modeles recherches
+	 *    @param    int		$useempty          Affiche valeur vide dans liste
+	 *    @param    int		$fk_user           User that has created the template (this is set to null to get all export model when EXPORTS_SHARE_MODELS is on)
+	 *    @return	void
+	 */
+	public function select_import_model($selected = '', $htmlname = 'importmodelid', $type = '', $useempty = 0, $fk_user = null)
+	{
+		// phpcs:enable
+		global $conf, $langs, $user;
 
-        $sql = "SELECT rowid, label, fk_user";
-        $sql .= " FROM ".MAIN_DB_PREFIX."import_model";
-        $sql .= " WHERE type = '".$this->db->escape($type)."'";
-        if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
-        $sql .= " ORDER BY rowid";
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty)
-            {
-                print '<option value="-1">&nbsp;</option>';
-            }
+		$sql = "SELECT rowid, label, fk_user";
+		$sql .= " FROM ".MAIN_DB_PREFIX."import_model";
+		$sql .= " WHERE type = '".$this->db->escape($type)."'";
+		if (!empty($fk_user)) $sql .= " AND fk_user IN (0, ".$fk_user.")"; // An export model
+		$sql .= " ORDER BY rowid";
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			print '<select class="flat minwidth200" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty)
+			{
+				print '<option value="-1">&nbsp;</option>';
+			}
 
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            while ($i < $num)
-            {
-                $obj = $this->db->fetch_object($result);
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$obj = $this->db->fetch_object($result);
 
-                $label = $obj->label;
-                if ($obj->fk_user == 0) {
-                	$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
-                } elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
-                	$tmpuser = new User($this->db);
-                	$tmpuser->fetch($obj->fk_user);
-                	$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
-                }
+				$label = $obj->label;
+				if ($obj->fk_user == 0) {
+					$label .= ' <span class="opacitymedium">('.$langs->trans("Everybody").')</span>';
+				} elseif (!empty($conf->global->EXPORTS_SHARE_MODELS) && empty($fk_user) && is_object($user) && $user->id != $obj->fk_user) {
+					$tmpuser = new User($this->db);
+					$tmpuser->fetch($obj->fk_user);
+					$label .= ' <span class="opacitymedium">('.$tmpuser->getFullName($langs).')</span>';
+				}
 
-                if ($selected == $obj->rowid)
-                {
-                    print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
-                } else {
-                    print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
-                }
-                print $label;
-                print '</option>';
-                $i++;
-            }
-            print "</select>";
-            print ajax_combobox($htmlname);
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+				if ($selected == $obj->rowid)
+				{
+					print '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($label).'">';
+				} else {
+					print '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($label).'">';
+				}
+				print $label;
+				print '</option>';
+				$i++;
+			}
+			print "</select>";
+			print ajax_combobox($htmlname);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of ecotaxes with label
-     *
-     *    @param	string	$selected   Preselected ecotaxes
-     *    @param    string	$htmlname	Name of combo list
-     *    @return	integer
-     */
-    public function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of ecotaxes with label
+	 *
+	 *    @param	string	$selected   Preselected ecotaxes
+	 *    @param    string	$htmlname	Name of combo list
+	 *    @return	integer
+	 */
+	public function select_ecotaxes($selected = '', $htmlname = 'ecotaxe_id')
+	{
+		// phpcs:enable
+		global $langs;
 
-        $sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";
-        $sql .= " c.label as country";
-        $sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
-        $sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
-        $sql .= " ORDER BY country, e.organization ASC, e.code ASC";
+		$sql = "SELECT e.rowid, e.code, e.label, e.price, e.organization,";
+		$sql .= " c.label as country";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_ecotaxe as e,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE e.active = 1 AND e.fk_pays = c.rowid";
+		$sql .= " ORDER BY country, e.organization ASC, e.code ASC";
 
-    	dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            print '<select class="flat" name="'.$htmlname.'">';
-            $num = $this->db->num_rows($resql);
-            $i = 0;
-            print '<option value="-1">&nbsp;</option>'."\n";
-            if ($num)
-            {
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($resql);
-                    if ($selected && $selected == $obj->rowid)
-                    {
-                        print '<option value="'.$obj->rowid.'" selected>';
-                    } else {
-                        print '<option value="'.$obj->rowid.'">';
-                        //print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
-                    }
-                    $selectOptionValue = $obj->code.' - '.$obj->label.' : '.price($obj->price).' '.$langs->trans("HT").' ('.$obj->organization.')';
-                    print $selectOptionValue;
-                    print '</option>';
-                    $i++;
-                }
-            }
-            print '</select>';
-            return 0;
-        } else {
-            dol_print_error($this->db);
-            return 1;
-        }
-    }
+		dol_syslog(get_class($this).'::select_ecotaxes', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			print '<select class="flat" name="'.$htmlname.'">';
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			print '<option value="-1">&nbsp;</option>'."\n";
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					if ($selected && $selected == $obj->rowid)
+					{
+						print '<option value="'.$obj->rowid.'" selected>';
+					} else {
+						print '<option value="'.$obj->rowid.'">';
+						//print '<option onmouseover="showtip(\''.$obj->label.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
+					}
+					$selectOptionValue = $obj->code.' - '.$obj->label.' : '.price($obj->price).' '.$langs->trans("HT").' ('.$obj->organization.')';
+					print $selectOptionValue;
+					print '</option>';
+					$i++;
+				}
+			}
+			print '</select>';
+			return 0;
+		} else {
+			dol_print_error($this->db);
+			return 1;
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return list of revenue stamp for country
-     *
-     *    @param	string	$selected   	Value of preselected revenue stamp
-     *    @param    string	$htmlname   	Name of combo list
-     *    @param    string	$country_code   Country Code
-     *    @return	string					HTML select list
-     */
-    public function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')
-    {
-        // phpcs:enable
-    	global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return list of revenue stamp for country
+	 *
+	 *    @param	string	$selected   	Value of preselected revenue stamp
+	 *    @param    string	$htmlname   	Name of combo list
+	 *    @param    string	$country_code   Country Code
+	 *    @return	string					HTML select list
+	 */
+	public function select_revenue_stamp($selected = '', $htmlname = 'revenuestamp', $country_code = '')
+	{
+		// phpcs:enable
+		global $langs;
 
-    	$out = '';
+		$out = '';
 
-    	$sql = "SELECT r.taux, r.revenuestamp_type";
-    	$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
-    	$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
-    	$sql .= " AND c.code = '".$this->db->escape($country_code)."'";
+		$sql = "SELECT r.taux, r.revenuestamp_type";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_revenuestamp as r,".MAIN_DB_PREFIX."c_country as c";
+		$sql .= " WHERE r.active = 1 AND r.fk_pays = c.rowid";
+		$sql .= " AND c.code = '".$this->db->escape($country_code)."'";
 
-    	dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
-    	$resql = $this->db->query($sql);
-    	if ($resql)
-    	{
-    		$out .= '<select class="flat" name="'.$htmlname.'">';
-    		$num = $this->db->num_rows($resql);
-    		$i = 0;
-    		$out .= '<option value="0">&nbsp;</option>'."\n";
-    		if ($num)
-    		{
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($resql);
-    				if (($selected && $selected == $obj->taux) || $num == 1)
-    				{
-    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
-    				} else {
-    					$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
-    					//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
-    				}
-    				$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
-    				$out .= '</option>';
-    				$i++;
-    			}
-    		}
-    		$out .= '</select>';
-    		return $out;
-    	} else {
-    		dol_print_error($this->db);
-    		return '';
-    	}
-    }
+		dol_syslog(get_class($this).'::select_revenue_stamp', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$out .= '<select class="flat" name="'.$htmlname.'">';
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			$out .= '<option value="0">&nbsp;</option>'."\n";
+			if ($num)
+			{
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($resql);
+					if (($selected && $selected == $obj->taux) || $num == 1)
+					{
+						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').' selected>';
+					} else {
+						$out .= '<option value="'.$obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '').'"'.($obj->revenuestamp_type == 'percent' ? ' data-type="percent"' : '').'>';
+						//print '<option onmouseover="showtip(\''.$obj->libelle.'\')" onMouseout="hidetip()" value="'.$obj->rowid.'">';
+					}
+					$out .= $obj->taux.($obj->revenuestamp_type == 'percent' ? '%' : '');
+					$out .= '</option>';
+					$i++;
+				}
+			}
+			$out .= '</select>';
+			return $out;
+		} else {
+			dol_print_error($this->db);
+			return '';
+		}
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    Return a HTML select list to select a percent
-     *
-     *    @param	integer	$selected      	pourcentage pre-selectionne
-     *    @param    string	$htmlname      	nom de la liste deroulante
-     *    @param	int		$disabled		Disabled or not
-     *    @param    int		$increment     	increment value
-     *    @param    int		$start         	start value
-     *    @param    int		$end           	end value
-     *    @param    int     $showempty      Add also an empty line
-     *    @return   string					HTML select string
-     */
-    public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)
-    {
-        // phpcs:enable
-        $return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
-        if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    Return a HTML select list to select a percent
+	 *
+	 *    @param	integer	$selected      	pourcentage pre-selectionne
+	 *    @param    string	$htmlname      	nom de la liste deroulante
+	 *    @param	int		$disabled		Disabled or not
+	 *    @param    int		$increment     	increment value
+	 *    @param    int		$start         	start value
+	 *    @param    int		$end           	end value
+	 *    @param    int     $showempty      Add also an empty line
+	 *    @return   string					HTML select string
+	 */
+	public function select_percent($selected = 0, $htmlname = 'percent', $disabled = 0, $increment = 5, $start = 0, $end = 100, $showempty = 0)
+	{
+		// phpcs:enable
+		$return = '<select class="flat" name="'.$htmlname.'" '.($disabled ? 'disabled' : '').'>';
+		if ($showempty) $return .= '<option value="-1"'.(($selected == -1 || $selected == '') ? ' selected' : '').'>&nbsp;</option>';
 
-        for ($i = $start; $i <= $end; $i += $increment)
-        {
-            if ($selected != '' && (int) $selected == $i)
-            {
-                $return .= '<option value="'.$i.'" selected>';
-            } else {
-                $return .= '<option value="'.$i.'">';
-            }
-            $return .= $i.' % ';
-            $return .= '</option>';
-        }
+		for ($i = $start; $i <= $end; $i += $increment)
+		{
+			if ($selected != '' && (int) $selected == $i)
+			{
+				$return .= '<option value="'.$i.'" selected>';
+			} else {
+				$return .= '<option value="'.$i.'">';
+			}
+			$return .= $i.' % ';
+			$return .= '</option>';
+		}
 
-        $return .= '</select>';
+		$return .= '</select>';
 
-        return $return;
-    }
+		return $return;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     * Return select list for categories (to use in form search selectors)
-     *
-     * @param	int		$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
-     * @param   integer	$selected     	Preselected value
-     * @param   string	$htmlname      	Name of combo list
-     * @param	int		$nocateg		Show also an entry "Not categorized"
-     * @param   int     $showempty      Add also an empty line
-     * @param   string  $morecss        More CSS
-     * @return  string		        	Html combo list code
-     * @see	select_all_categories()
-     */
-    public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')
-    {
-        // phpcs:enable
-        global $conf, $langs;
-        require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return select list for categories (to use in form search selectors)
+	 *
+	 * @param	int		$type			Type of category ('customer', 'supplier', 'contact', 'product', 'member'). Old mode (0, 1, 2, ...) is deprecated.
+	 * @param   integer	$selected     	Preselected value
+	 * @param   string	$htmlname      	Name of combo list
+	 * @param	int		$nocateg		Show also an entry "Not categorized"
+	 * @param   int     $showempty      Add also an empty line
+	 * @param   string  $morecss        More CSS
+	 * @return  string		        	Html combo list code
+	 * @see	select_all_categories()
+	 */
+	public function select_categories($type, $selected = 0, $htmlname = 'search_categ', $nocateg = 0, $showempty = 1, $morecss = '')
+	{
+		// phpcs:enable
+		global $conf, $langs;
+		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
-        // For backward compatibility
-        if (is_numeric($type))
-        {
-            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
-        }
+		// For backward compatibility
+		if (is_numeric($type))
+		{
+			dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);
+		}
 
-        // Load list of "categories"
-        $static_categs = new Categorie($this->db);
-        $tab_categs = $static_categs->get_full_arbo($type);
+		// Load list of "categories"
+		$static_categs = new Categorie($this->db);
+		$tab_categs = $static_categs->get_full_arbo($type);
 
-        $moreforfilter = '';
-        // Enhance with select2
-        if ($conf->use_javascript_ajax)
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-            $comboenhancement = ajax_combobox('select_categ_'.$htmlname);
-            $moreforfilter .= $comboenhancement;
-        }
+		$moreforfilter = '';
+		// Enhance with select2
+		if ($conf->use_javascript_ajax)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$comboenhancement = ajax_combobox('select_categ_'.$htmlname);
+			$moreforfilter .= $comboenhancement;
+		}
 
-        // Print a select with each of them
-        $moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing
+		// Print a select with each of them
+		$moreforfilter .= '<select class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" id="select_categ_'.$htmlname.'" name="'.$htmlname.'">';
+		if ($showempty) $moreforfilter .= '<option value="0">&nbsp;</option>'; // Should use -1 to say nothing
 
-        if (is_array($tab_categs))
-        {
-            foreach ($tab_categs as $categ)
-            {
-                $moreforfilter .= '<option value="'.$categ['id'].'"';
-                if ($categ['id'] == $selected) $moreforfilter .= ' selected';
-                $moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';
-            }
-        }
-        if ($nocateg)
-        {
-        	$langs->load("categories");
-        	$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';
-        }
-        $moreforfilter .= '</select>';
+		if (is_array($tab_categs))
+		{
+			foreach ($tab_categs as $categ)
+			{
+				$moreforfilter .= '<option value="'.$categ['id'].'"';
+				if ($categ['id'] == $selected) $moreforfilter .= ' selected';
+				$moreforfilter .= '>'.dol_trunc($categ['fulllabel'], 50, 'middle').'</option>';
+			}
+		}
+		if ($nocateg)
+		{
+			$langs->load("categories");
+			$moreforfilter .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NotCategorized").' -</option>';
+		}
+		$moreforfilter .= '</select>';
 
-        return $moreforfilter;
-    }
+		return $moreforfilter;
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return select list for categories (to use in form search selectors)
-     *
-     *  @param	string	$selected     		Preselected value
-     *  @param  string	$htmlname      		Name of combo list (example: 'search_sale')
-     *  @param  User	$user           	Object user
-     *  @param	int		$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-     *  @param	int		$showempty			1=show also an empty value
-     *  @param	string	$morecss			More CSS
-     *  @param	int		$norepresentative	Show also an entry "Not categorized"
-     *  @return string						Html combo list code
-     */
-    public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)
-    {
-        // phpcs:enable
-        global $conf, $langs, $hookmanager;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return select list for categories (to use in form search selectors)
+	 *
+	 *  @param	string	$selected     		Preselected value
+	 *  @param  string	$htmlname      		Name of combo list (example: 'search_sale')
+	 *  @param  User	$user           	Object user
+	 *  @param	int		$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
+	 *  @param	int		$showempty			1=show also an empty value
+	 *  @param	string	$morecss			More CSS
+	 *  @param	int		$norepresentative	Show also an entry "Not categorized"
+	 *  @return string						Html combo list code
+	 */
+	public function select_salesrepresentatives($selected, $htmlname, $user, $showstatus = 0, $showempty = 1, $morecss = '', $norepresentative = 0)
+	{
+		// phpcs:enable
+		global $conf, $langs, $hookmanager;
 
-        $langs->load('users');
+		$langs->load('users');
 
-        $out = '';
-        // Enhance with select2
-        if ($conf->use_javascript_ajax)
-        {
-            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+		$out = '';
+		// Enhance with select2
+		if ($conf->use_javascript_ajax)
+		{
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 
-            $comboenhancement = ajax_combobox($htmlname);
-            if ($comboenhancement)
-            {
-            	$out .= $comboenhancement;
-            }
-        }
+			$comboenhancement = ajax_combobox($htmlname);
+			if ($comboenhancement)
+			{
+				$out .= $comboenhancement;
+			}
+		}
 
-	    $reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);
+		$reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);
 
-        // Select each sales and print them in a select input
-        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-        if ($showempty) $out .= '<option value="0">&nbsp;</option>';
+		// Select each sales and print them in a select input
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+		if ($showempty) $out .= '<option value="0">&nbsp;</option>';
 
-        // Get list of users allowed to be viewed
-        $sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
-        $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
+		// Get list of users allowed to be viewed
+		$sql_usr = "SELECT u.rowid, u.lastname, u.firstname, u.statut, u.login";
+		$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u";
 
-        if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-        {
-        	if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-        		$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
-        	} else {
-        		$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
-        		$sql_usr .= " OR u.entity = 0"; // Show always superadmin
-        	}
-        } else {
-        	$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
-        }
+		if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+		{
+			if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+				$sql_usr .= " WHERE u.entity IS NOT NULL"; // Show all users
+			} else {
+				$sql_usr .= " WHERE EXISTS (SELECT ug.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug WHERE u.rowid = ug.fk_user AND ug.entity IN (".getEntity('usergroup')."))";
+				$sql_usr .= " OR u.entity = 0"; // Show always superadmin
+			}
+		} else {
+			$sql_usr .= " WHERE u.entity IN (".getEntity('user').")";
+		}
 
-        if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
-        if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;
+		if (empty($user->rights->user->user->lire)) $sql_usr .= " AND u.rowid = ".$user->id;
+		if (!empty($user->socid)) $sql_usr .= " AND u.fk_soc = ".$user->socid;
 
-	    //Add hook to filter on user (for exemple on usergroup define in custom modules)
-	    if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];
+		//Add hook to filter on user (for exemple on usergroup define in custom modules)
+		if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[0];
 
-        // Add existing sales representatives of thirdparty of external user
-        if (empty($user->rights->user->user->lire) && $user->socid)
-        {
-            $sql_usr .= " UNION ";
-            $sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
-            $sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		// Add existing sales representatives of thirdparty of external user
+		if (empty($user->rights->user->user->lire) && $user->socid)
+		{
+			$sql_usr .= " UNION ";
+			$sql_usr .= "SELECT u2.rowid, u2.lastname, u2.firstname, u2.statut, u2.login";
+			$sql_usr .= " FROM ".MAIN_DB_PREFIX."user as u2, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 
-            if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
-            {
-            	if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
-            		$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
-            	} else {
-            		$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
-            	}
-            } else {
-            	$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
-            }
+			if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE))
+			{
+				if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
+					$sql_usr .= " WHERE u2.entity IS NOT NULL"; // Show all users
+				} else {
+					$sql_usr .= " WHERE EXISTS (SELECT ug2.fk_user FROM ".MAIN_DB_PREFIX."usergroup_user as ug2 WHERE u2.rowid = ug2.fk_user AND ug2.entity IN (".getEntity('usergroup')."))";
+				}
+			} else {
+				$sql_usr .= " WHERE u2.entity IN (".getEntity('user').")";
+			}
 
-            $sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
+			$sql_usr .= " AND u2.rowid = sc.fk_user AND sc.fk_soc=".$user->socid;
 
-	        //Add hook to filter on user (for exemple on usergroup define in custom modules)
-	        if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];
-        }
-	    $sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
-        //print $sql_usr;exit;
+			//Add hook to filter on user (for exemple on usergroup define in custom modules)
+			if (!empty($reshook)) $sql_usr .= $hookmanager->resArray[1];
+		}
+		$sql_usr .= " ORDER BY statut DESC, lastname ASC"; // Do not use 'ORDER BY u.statut' here, not compatible with the UNION.
+		//print $sql_usr;exit;
 
-        $resql_usr = $this->db->query($sql_usr);
-        if ($resql_usr)
-        {
-            while ($obj_usr = $this->db->fetch_object($resql_usr))
-            {
-                $out .= '<option value="'.$obj_usr->rowid.'"';
+		$resql_usr = $this->db->query($sql_usr);
+		if ($resql_usr)
+		{
+			while ($obj_usr = $this->db->fetch_object($resql_usr))
+			{
+				$out .= '<option value="'.$obj_usr->rowid.'"';
 
-                if ($obj_usr->rowid == $selected) $out .= ' selected';
+				if ($obj_usr->rowid == $selected) $out .= ' selected';
 
-                $out .= '>';
-                $out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
-                // Complete name with more info
-                $moreinfo = 0;
-                if (!empty($conf->global->MAIN_SHOW_LOGIN))
-                {
-                    $out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
-                    $moreinfo++;
-                }
-                if ($showstatus >= 0)
-                {
+				$out .= '>';
+				$out .= dolGetFirstLastname($obj_usr->firstname, $obj_usr->lastname);
+				// Complete name with more info
+				$moreinfo = 0;
+				if (!empty($conf->global->MAIN_SHOW_LOGIN))
+				{
+					$out .= ($moreinfo ? ' - ' : ' (').$obj_usr->login;
+					$moreinfo++;
+				}
+				if ($showstatus >= 0)
+				{
 					if ($obj_usr->statut == 1 && $showstatus == 1)
 					{
 						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');
-	                	$moreinfo++;
+						$moreinfo++;
 					}
 					if ($obj_usr->statut == 0)
 					{
 						$out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');
-                		$moreinfo++;
+						$moreinfo++;
 					}
 				}
 				$out .= ($moreinfo ? ')' : '');
-                $out .= '</option>';
-            }
-            $this->db->free($resql_usr);
-        } else {
-            dol_print_error($this->db);
-        }
+				$out .= '</option>';
+			}
+			$this->db->free($resql_usr);
+		} else {
+			dol_print_error($this->db);
+		}
 
-        if ($norepresentative)
-        {
-        	$langs->load("companies");
-        	$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';
-        }
+		if ($norepresentative)
+		{
+			$langs->load("companies");
+			$out .= '<option value="-2"'.($selected == -2 ? ' selected' : '').'>- '.$langs->trans("NoSalesRepresentativeAffected").' -</option>';
+		}
 
-        $out .= '</select>';
+		$out .= '</select>';
 
-        return $out;
-    }
+		return $out;
+	}
 
-    /**
-     *	Return list of project and tasks
-     *
-     *	@param  int		$selectedtask   		Pre-selected task
-     *  @param  int		$projectid				Project id
-     * 	@param  string	$htmlname    			Name of html select
-     * 	@param	int		$modeproject			1 to restrict on projects owned by user
-     * 	@param	int		$modetask				1 to restrict on tasks associated to user
-     * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists
-     *  @param  int		$useempty       		0=Allow empty values
-     *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
+	/**
+	 *	Return list of project and tasks
+	 *
+	 *	@param  int		$selectedtask   		Pre-selected task
+	 *  @param  int		$projectid				Project id
+	 * 	@param  string	$htmlname    			Name of html select
+	 * 	@param	int		$modeproject			1 to restrict on projects owned by user
+	 * 	@param	int		$modetask				1 to restrict on tasks associated to user
+	 * 	@param	int		$mode					0=Return list of tasks and their projects, 1=Return projects and tasks if exists
+	 *  @param  int		$useempty       		0=Allow empty values
+	 *  @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
 	 *  @param	string	$filteronprojstatus		Filter on project status ('-1'=no filter, '0,1'=Draft+Validated status)
-     *  @param	string	$morecss				More css
-     *  @return	void
-     */
-    public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
-    {
-        global $user, $langs;
+	 *  @param	string	$morecss				More css
+	 *  @return	void
+	 */
+	public function selectProjectTasks($selectedtask = '', $projectid = 0, $htmlname = 'task_parent', $modeproject = 0, $modetask = 0, $mode = 0, $useempty = 0, $disablechildoftaskid = 0, $filteronprojstatus = '', $morecss = '')
+	{
+		global $user, $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
-        //print $modeproject.'-'.$modetask;
-        $task = new Task($this->db);
-        $tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);
-        if ($tasksarray)
-        {
-        	print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-            if ($useempty) print '<option value="0">&nbsp;</option>';
-            $j = 0;
-            $level = 0;
-            $this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
-            print '</select>';
+		//print $modeproject.'-'.$modetask;
+		$task = new Task($this->db);
+		$tasksarray = $task->getTasksArray($modetask ? $user : 0, $modeproject ? $user : 0, $projectid, 0, $mode, '', $filteronprojstatus);
+		if ($tasksarray)
+		{
+			print '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+			if ($useempty) print '<option value="0">&nbsp;</option>';
+			$j = 0;
+			$level = 0;
+			$this->_pLineSelect($j, 0, $tasksarray, $level, $selectedtask, $projectid, $disablechildoftaskid);
+			print '</select>';
 
-            print ajax_combobox($htmlname);
-        } else {
-            print '<div class="warning">'.$langs->trans("NoProject").'</div>';
-        }
-    }
+			print ajax_combobox($htmlname);
+		} else {
+			print '<div class="warning">'.$langs->trans("NoProject").'</div>';
+		}
+	}
 
-    /**
-     * Write lines of a project (all lines of a project if parent = 0)
-     *
-     * @param 	int		$inc					Cursor counter
-     * @param 	int		$parent					Id of parent task we want to see
-     * @param 	array	$lines					Array of task lines
-     * @param 	int		$level					Level
-     * @param 	int		$selectedtask			Id selected task
-     * @param 	int		$selectedproject		Id selected project
-     * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
-     * @return	void
-     */
-    private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)
-    {
-        global $langs, $user, $conf;
+	/**
+	 * Write lines of a project (all lines of a project if parent = 0)
+	 *
+	 * @param 	int		$inc					Cursor counter
+	 * @param 	int		$parent					Id of parent task we want to see
+	 * @param 	array	$lines					Array of task lines
+	 * @param 	int		$level					Level
+	 * @param 	int		$selectedtask			Id selected task
+	 * @param 	int		$selectedproject		Id selected project
+	 * @param	int		$disablechildoftaskid	1=Disable task that are child of the provided task id
+	 * @return	void
+	 */
+	private function _pLineSelect(&$inc, $parent, $lines, $level = 0, $selectedtask = 0, $selectedproject = 0, $disablechildoftaskid = 0)
+	{
+		global $langs, $user, $conf;
 
-        $lastprojectid = 0;
+		$lastprojectid = 0;
 
-        $numlines = count($lines);
-        for ($i = 0; $i < $numlines; $i++) {
-            if ($lines[$i]->fk_parent == $parent) {
-                //var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
+		$numlines = count($lines);
+		for ($i = 0; $i < $numlines; $i++) {
+			if ($lines[$i]->fk_parent == $parent) {
+				//var_dump($selectedproject."--".$selectedtask."--".$lines[$i]->fk_project."_".$lines[$i]->id);		// $lines[$i]->id may be empty if project has no lines
 
-                // Break on a new project
-                if ($parent == 0)	// We are on a task at first level
-                {
-                    if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
-                    {
-                        if ($i > 0) print '<option value="0" disabled>----------</option>';
-                        print '<option value="'.$lines[$i]->fk_project.'_0"';
-                        if ($selectedproject == $lines[$i]->fk_project) print ' selected';
-                        print '>'; // Project -> Task
-                        print $langs->trans("Project").' '.$lines[$i]->projectref;
-                        if (empty($lines[$i]->public))
-                        {
-                            print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                        } else {
-                            print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
-                        }
-                        //print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
-                        print "</option>\n";
+				// Break on a new project
+				if ($parent == 0)	// We are on a task at first level
+				{
+					if ($lines[$i]->fk_project != $lastprojectid)	// Break found on project
+					{
+						if ($i > 0) print '<option value="0" disabled>----------</option>';
+						print '<option value="'.$lines[$i]->fk_project.'_0"';
+						if ($selectedproject == $lines[$i]->fk_project) print ' selected';
+						print '>'; // Project -> Task
+						print $langs->trans("Project").' '.$lines[$i]->projectref;
+						if (empty($lines[$i]->public))
+						{
+							print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
+						} else {
+							print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
+						}
+						//print '-'.$parent.'-'.$lines[$i]->fk_project.'-'.$lastprojectid;
+						print "</option>\n";
 
-                        $lastprojectid = $lines[$i]->fk_project;
-                        $inc++;
-                    }
-                }
+						$lastprojectid = $lines[$i]->fk_project;
+						$inc++;
+					}
+				}
 
-                $newdisablechildoftaskid = $disablechildoftaskid;
+				$newdisablechildoftaskid = $disablechildoftaskid;
 
-                // Print task
-                if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
-                {
-                	// Check if we must disable entry
-                	$disabled = 0;
-                	if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
-                	{
-               			$disabled++;
-               			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
-                	}
+				// Print task
+				if (isset($lines[$i]->id))		// We use isset because $lines[$i]->id may be null if project has no task and are on root project (tasks may be caught by a left join). We enter here only if '0' or >0
+				{
+					// Check if we must disable entry
+					$disabled = 0;
+					if ($disablechildoftaskid && (($lines[$i]->id == $disablechildoftaskid || $lines[$i]->fk_parent == $disablechildoftaskid)))
+					{
+			   			$disabled++;
+			   			if ($lines[$i]->fk_parent == $disablechildoftaskid) $newdisablechildoftaskid = $lines[$i]->id; // If task is child of a disabled parent, we will propagate id to disable next child too
+					}
 
-                    print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
-                    if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
-                    if ($disabled) print ' disabled';
-                    print '>';
-                    print $langs->trans("Project").' '.$lines[$i]->projectref;
-                    print ' '.$lines[$i]->projectlabel;
-                    if (empty($lines[$i]->public))
-                    {
-                        print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
-                    } else {
-                        print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
-                    }
-                    if ($lines[$i]->id) print ' > ';
-                    for ($k = 0; $k < $level; $k++)
-                    {
-                        print "&nbsp;&nbsp;&nbsp;";
-                    }
-                    print $lines[$i]->ref.' '.$lines[$i]->label."</option>\n";
-                    $inc++;
-                }
+					print '<option value="'.$lines[$i]->fk_project.'_'.$lines[$i]->id.'"';
+					if (($lines[$i]->id == $selectedtask) || ($lines[$i]->fk_project.'_'.$lines[$i]->id == $selectedtask)) print ' selected';
+					if ($disabled) print ' disabled';
+					print '>';
+					print $langs->trans("Project").' '.$lines[$i]->projectref;
+					print ' '.$lines[$i]->projectlabel;
+					if (empty($lines[$i]->public))
+					{
+						print ' ('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')';
+					} else {
+						print ' ('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')';
+					}
+					if ($lines[$i]->id) print ' > ';
+					for ($k = 0; $k < $level; $k++)
+					{
+						print "&nbsp;&nbsp;&nbsp;";
+					}
+					print $lines[$i]->ref.' '.$lines[$i]->label."</option>\n";
+					$inc++;
+				}
 
-                $level++;
-                if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
-                $level--;
-            }
-        }
-    }
+				$level++;
+				if ($lines[$i]->id) $this->_pLineSelect($inc, $lines[$i]->id, $lines, $level, $selectedtask, $selectedproject, $newdisablechildoftaskid);
+				$level--;
+			}
+		}
+	}
 
 
-    /**
-     *  Output a HTML thumb of color or a text if not defined.
-     *
-     *  @param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')
-     *  @param	string		$textifnotdefined	Text to show if color not defined
-     *  @return	string							HTML code for color thumb
-     *  @see selectColor()
-     */
-    public static function showColor($color, $textifnotdefined = '')
-    {
-    	$textcolor = 'FFF';
-    	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-    	if (colorIsLight($color)) $textcolor = '000';
+	/**
+	 *  Output a HTML thumb of color or a text if not defined.
+	 *
+	 *  @param	string		$color				String with hex (FFFFFF) or comma RGB ('255,255,255')
+	 *  @param	string		$textifnotdefined	Text to show if color not defined
+	 *  @return	string							HTML code for color thumb
+	 *  @see selectColor()
+	 */
+	public static function showColor($color, $textifnotdefined = '')
+	{
+		$textcolor = 'FFF';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		if (colorIsLight($color)) $textcolor = '000';
 
-    	$color = colorArrayToHex(colorStringToArray($color, array()), '');
+		$color = colorArrayToHex(colorStringToArray($color, array()), '');
 
 		if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; color: #'.$textcolor.'; background-color: #'.$color.'" value="'.$color.'">';
 		else print $textifnotdefined;
-    }
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Output a HTML code to select a color
-     *
-     *  @param	string		$set_color		Pre-selected color
-     *  @param	string		$prefix			Name of HTML field
-     *  @param	string		$form_name		Deprecated. Not used.
-     *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
-     *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
-     *  @return	void
-     *  @deprecated Use instead selectColor
-     *  @see selectColor()
-     */
-    public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')
-    {
-        // phpcs:enable
-    	print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Output a HTML code to select a color
+	 *
+	 *  @param	string		$set_color		Pre-selected color
+	 *  @param	string		$prefix			Name of HTML field
+	 *  @param	string		$form_name		Deprecated. Not used.
+	 *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
+	 *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
+	 *  @return	void
+	 *  @deprecated Use instead selectColor
+	 *  @see selectColor()
+	 */
+	public function select_color($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '')
+	{
+		// phpcs:enable
+		print $this->selectColor($set_color, $prefix, $form_name, $showcolorbox, $arrayofcolors);
+	}
 
-    /**
-     *  Output a HTML code to select a color. Field will return an hexa color like '334455'.
-     *
-     *  @param	string		$set_color		Pre-selected color
-     *  @param	string		$prefix			Name of HTML field
-     *  @param	string		$form_name		Deprecated. Not used.
-     *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
-     *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
-     *  @param	string		$morecss		Add css style into input field
-     *  @return	string
-     *  @see showColor()
-     */
-    public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '')
-    {
-        // Deprecation warning
-        if ($form_name) {
-            dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);
-        }
+	/**
+	 *  Output a HTML code to select a color. Field will return an hexa color like '334455'.
+	 *
+	 *  @param	string		$set_color		Pre-selected color
+	 *  @param	string		$prefix			Name of HTML field
+	 *  @param	string		$form_name		Deprecated. Not used.
+	 *  @param	int			$showcolorbox	1=Show color code and color box, 0=Show only color code
+	 *  @param 	array		$arrayofcolors	Array of colors. Example: array('29527A','5229A3','A32929','7A367A','B1365F','0D7813')
+	 *  @param	string		$morecss		Add css style into input field
+	 *  @param	string		$setpropertyonselect	Set this property after selecting a color
+	 *  @return	string
+	 *  @see showColor()
+	 */
+	public static function selectColor($set_color = '', $prefix = 'f_color', $form_name = '', $showcolorbox = 1, $arrayofcolors = '', $morecss = '', $setpropertyonselect = '')
+	{
+		// Deprecation warning
+		if ($form_name) {
+			dol_syslog(__METHOD__.": form_name parameter is deprecated", LOG_WARNING);
+		}
 
-        global $langs, $conf;
+		global $langs, $conf;
 
-        $out = '';
+		$out = '';
 
-        if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
-        {
-            $langs->load("other");
-            if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
-            {
-	            $out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
-	            $out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
-	            $out .= '<script type="text/javascript">
+		if (!is_array($arrayofcolors) || count($arrayofcolors) < 1)
+		{
+			$langs->load("other");
+			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
+			{
+				$out .= '<link rel="stylesheet" media="screen" type="text/css" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/css/jPicker-1.1.6.css" />';
+				$out .= '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/jpicker-1.1.6.js"></script>';
+				$out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                $(\'#colorpicker'.$prefix.'\').jPicker( {
-	                window: {
-	                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
-	                  effects:
-	                    {
-	                    type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
-	                    speed:
-	                    {
-	                      show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
-	                      hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
-	                    }
-	                    },
-	                  position:
-	                    {
-	                    x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
-	                    y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
-	                    },
-	                },
-	                images: {
-	                    clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
-	                    picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
-	          		},
-	                localization: // alter these to change the text presented by the picker (e.g. different language)
-	                  {
-	                    text:
-	                    {
-	                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
-	                      newColor: \''.dol_escape_js($langs->trans("New")).'\',
-	                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
-	                      ok: \''.dol_escape_js($langs->trans("Save")).'\',
-	                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
-	                    }
-	                  }
-			        } ); });
+		                window: {
+		                  title: \''.dol_escape_js($langs->trans("SelectAColor")).'\', /* any title for the jPicker window itself - displays "Drag Markers To Pick A Color" if left null */
+		                  effects:
+		                    {
+		                    type: \'show\', /* effect used to show/hide an expandable picker. Acceptable values "slide", "show", "fade" */
+		                    speed:
+		                    {
+		                      show: \'fast\', /* duration of "show" effect. Acceptable values are "fast", "slow", or time in ms */
+		                      hide: \'fast\' /* duration of "hide" effect. Acceptable values are "fast", "slow", or time in ms */
+		                    }
+		                    },
+		                  position:
+		                    {
+		                    x: \'screenCenter\', /* acceptable values "left", "center", "right", "screenCenter", or relative px value */
+		                    y: \'center\' /* acceptable values "top", "bottom", "center", or relative px value */
+		                    },
+		                },
+		                images: {
+		                    clientPath: \''.DOL_URL_ROOT.'/includes/jquery/plugins/jpicker/images/\',
+		                    picker: { file: \'../../../../../theme/common/colorpicker.png\', width: 14, height: 14 }
+		          		},
+		                localization: // alter these to change the text presented by the picker (e.g. different language)
+		                  {
+		                    text:
+		                    {
+		                      title: \''.dol_escape_js($langs->trans("SelectAColor")).'\',
+		                      newColor: \''.dol_escape_js($langs->trans("New")).'\',
+		                      currentColor: \''.dol_escape_js($langs->trans("Current")).'\',
+		                      ok: \''.dol_escape_js($langs->trans("Save")).'\',
+		                      cancel: \''.dol_escape_js($langs->trans("Cancel")).'\'
+		                    }
+		                  }
+				        },
+						function(color, context) { console.log("close"); },
+						function(color, context) { var hex = color.val(\'hex\'); console.log("new color selected in jpicker "+hex);';
+				if ($setpropertyonselect) { $out .= ' if (hex != null) document.documentElement.style.setProperty(\'--'.$setpropertyonselect.'\', \'#\'+hex);'; }
+						$out .= '},
+						function(color, context) { console.log("cancel"); }
+					);
+				 });
 	             </script>';
-            }
-            $out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
-        } else // In most cases, this is not used. We used instead function with no specific list of colors
-        {
-        	if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
-            {
-	        	$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
-	            $out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
-	            $out .= '<script type="text/javascript">
+			}
+			$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
+		} else // In most cases, this is not used. We used instead function with no specific list of colors
+		{
+			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax))
+			{
+				$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
+				$out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
+				$out .= '<script type="text/javascript">
 	             jQuery(document).ready(function(){
 	                 jQuery(\'#colorpicker'.$prefix.'\').colorpicker({
 	                     size: 14,
@@ -778,275 +786,284 @@ class FormOther
 	                 });
 	             });
 	             </script>';
-            }
-            $out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
-            //print '<option value="-1">&nbsp;</option>';
-            foreach ($arrayofcolors as $val)
-            {
-                $out .= '<option value="'.$val.'"';
-                if ($set_color == $val) $out .= ' selected';
-                $out .= '>'.$val.'</option>';
-            }
-            $out .= '</select>';
-        }
+			}
+			$out .= '<select id="colorpicker'.$prefix.'" class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$prefix.'">';
+			//print '<option value="-1">&nbsp;</option>';
+			foreach ($arrayofcolors as $val)
+			{
+				$out .= '<option value="'.$val.'"';
+				if ($set_color == $val) $out .= ' selected';
+				$out .= '>'.$val.'</option>';
+			}
+			$out .= '</select>';
+		}
 
-        return $out;
-    }
+		return $out;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Creation d'un icone de couleur
-     *
-     *	@param	string	$color		Couleur de l'image
-     *	@param	string	$module 	Nom du module
-     *	@param	string	$name		Nom de l'image
-     *	@param	int		$x 			Largeur de l'image en pixels
-     *	@param	int		$y      	Hauteur de l'image en pixels
-     *	@return	void
-     */
-    public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')
-    {
-        // phpcs:enable
-        global $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Creation d'un icone de couleur
+	 *
+	 *	@param	string	$color		Couleur de l'image
+	 *	@param	string	$module 	Nom du module
+	 *	@param	string	$name		Nom de l'image
+	 *	@param	int		$x 			Largeur de l'image en pixels
+	 *	@param	int		$y      	Hauteur de l'image en pixels
+	 *	@return	void
+	 */
+	public function CreateColorIcon($color, $module, $name, $x = '12', $y = '12')
+	{
+		// phpcs:enable
+		global $conf;
 
-        $file = $conf->$module->dir_temp.'/'.$name.'.png';
+		$file = $conf->$module->dir_temp.'/'.$name.'.png';
 
-        // On cree le repertoire contenant les icones
-        if (!file_exists($conf->$module->dir_temp))
-        {
-            dol_mkdir($conf->$module->dir_temp);
-        }
+		// On cree le repertoire contenant les icones
+		if (!file_exists($conf->$module->dir_temp))
+		{
+			dol_mkdir($conf->$module->dir_temp);
+		}
 
-        // On cree l'image en vraies couleurs
-        $image = imagecreatetruecolor($x, $y);
+		// On cree l'image en vraies couleurs
+		$image = imagecreatetruecolor($x, $y);
 
-        $color = substr($color, 1, 6);
+		$color = substr($color, 1, 6);
 
-        $rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge
-        $vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert
-        $bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu
+		$rouge = hexdec(substr($color, 0, 2)); //conversion du canal rouge
+		$vert  = hexdec(substr($color, 2, 2)); //conversion du canal vert
+		$bleu  = hexdec(substr($color, 4, 2)); //conversion du canal bleu
 
-        $couleur = imagecolorallocate($image, $rouge, $vert, $bleu);
-        //print $rouge.$vert.$bleu;
-        imagefill($image, 0, 0, $couleur); //on remplit l'image
-        // On cree la couleur et on l'attribue a une variable pour ne pas la perdre
-        ImagePng($image, $file); //renvoie une image sous format png
-        ImageDestroy($image);
-    }
+		$couleur = imagecolorallocate($image, $rouge, $vert, $bleu);
+		//print $rouge.$vert.$bleu;
+		imagefill($image, 0, 0, $couleur); //on remplit l'image
+		// On cree la couleur et on l'attribue a une variable pour ne pas la perdre
+		ImagePng($image, $file); //renvoie une image sous format png
+		ImageDestroy($image);
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *    	Return HTML combo list of week
-     *
-     *    	@param	string		$selected          Preselected value
-     *    	@param  string		$htmlname          Nom de la zone select
-     *    	@param  int			$useempty          Affiche valeur vide dans liste
-     *    	@return	string
-     */
-    public function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *    	Return HTML combo list of week
+	 *
+	 *    	@param	string		$selected          Preselected value
+	 *    	@param  string		$htmlname          Nom de la zone select
+	 *    	@param  int			$useempty          Affiche valeur vide dans liste
+	 *    	@return	string
+	 */
+	public function select_dayofweek($selected = '', $htmlname = 'weekid', $useempty = 0)
+	{
+		// phpcs:enable
+		global $langs;
 
-        $week = array(
-            0=>$langs->trans("Day0"),
-            1=>$langs->trans("Day1"),
-            2=>$langs->trans("Day2"),
-            3=>$langs->trans("Day3"),
-            4=>$langs->trans("Day4"),
-            5=>$langs->trans("Day5"),
-            6=>$langs->trans("Day6")
-        );
+		$week = array(
+			0=>$langs->trans("Day0"),
+			1=>$langs->trans("Day1"),
+			2=>$langs->trans("Day2"),
+			3=>$langs->trans("Day3"),
+			4=>$langs->trans("Day4"),
+			5=>$langs->trans("Day5"),
+			6=>$langs->trans("Day6")
+		);
 
-        $select_week = '<select class="flat" name="'.$htmlname.'">';
-        if ($useempty)
-        {
-            $select_week .= '<option value="-1">&nbsp;</option>';
-        }
-        foreach ($week as $key => $val)
-        {
-            if ($selected == $key)
-            {
-                $select_week .= '<option value="'.$key.'" selected>';
-            } else {
-                $select_week .= '<option value="'.$key.'">';
-            }
-            $select_week .= $val;
-            $select_week .= '</option>';
-        }
-        $select_week .= '</select>';
-        return $select_week;
-    }
+		$select_week = '<select class="flat" name="'.$htmlname.'">';
+		if ($useempty)
+		{
+			$select_week .= '<option value="-1">&nbsp;</option>';
+		}
+		foreach ($week as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$select_week .= '<option value="'.$key.'" selected>';
+			} else {
+				$select_week .= '<option value="'.$key.'">';
+			}
+			$select_week .= $val;
+			$select_week .= '</option>';
+		}
+		$select_week .= '</select>';
+		return $select_week;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *      Return HTML combo list of month
-     *
-     *      @param  string      $selected          	Preselected value
-     *      @param  string      $htmlname          	Name of HTML select object
-     *      @param  int         $useempty          	Show empty in list
-     *      @param  int         $longlabel         	Show long label
-     *      @param	string		$morecss			More Css
-     *      @return string
-     */
-    public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'maxwidth50imp valignmiddle')
-    {
-        // phpcs:enable
-        global $langs;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *      Return HTML combo list of month
+	 *
+	 *      @param  string      $selected          	Preselected value
+	 *      @param  string      $htmlname          	Name of HTML select object
+	 *      @param  int         $useempty          	Show empty in list
+	 *      @param  int         $longlabel         	Show long label
+	 *      @param	string		$morecss			More Css
+	 *      @return string
+	 */
+	public function select_month($selected = '', $htmlname = 'monthid', $useempty = 0, $longlabel = 0, $morecss = 'maxwidth50imp valignmiddle')
+	{
+		// phpcs:enable
+		global $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
-        if ($longlabel) $montharray = monthArray($langs, 0); // Get array
-        else $montharray = monthArray($langs, 1);
+		if ($longlabel) $montharray = monthArray($langs, 0); // Get array
+		else $montharray = monthArray($langs, 1);
 
-        $select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
-        if ($useempty)
-        {
-            $select_month .= '<option value="0">&nbsp;</option>';
-        }
-        foreach ($montharray as $key => $val)
-        {
-            if ($selected == $key)
-            {
-                $select_month .= '<option value="'.$key.'" selected>';
-            } else {
-                $select_month .= '<option value="'.$key.'">';
-            }
-            $select_month .= $val;
-            $select_month .= '</option>';
-        }
-        $select_month .= '</select>';
-        return $select_month;
-    }
+		$select_month = '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
+		if ($useempty)
+		{
+			$select_month .= '<option value="0">&nbsp;</option>';
+		}
+		foreach ($montharray as $key => $val)
+		{
+			if ($selected == $key)
+			{
+				$select_month .= '<option value="'.$key.'" selected>';
+			} else {
+				$select_month .= '<option value="'.$key.'">';
+			}
+			$select_month .= $val;
+			$select_month .= '</option>';
+		}
+		$select_month .= '</select>';
+		return $select_month;
+	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *	Return HTML combo list of years
-     *
-     *  @param  string		$selected       Preselected value (''=current year, -1=none, year otherwise)
-     *  @param  string		$htmlname       Name of HTML select object
-     *  @param  int			$useempty       Affiche valeur vide dans liste
-     *  @param  int			$min_year       Offset of minimum year into list (by default current year -10)
-     *  @param  int		    $max_year		Offset of maximum year into list (by default current year + 5)
-     *  @param	int			$offset			Offset
-     *  @param	int			$invert			Invert
-     *  @param	string		$option			Option
-     *  @param	string		$morecss		More CSS
-     *  @return	string
-     */
-    public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
-    {
-        // phpcs:enable
-        print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);
-    }
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return HTML combo list of years
+	 *
+	 *  @param  string		$selected       Preselected value (''=current year, -1=none, year otherwise)
+	 *  @param  string		$htmlname       Name of HTML select object
+	 *  @param  int			$useempty       Affiche valeur vide dans liste
+	 *  @param  int			$min_year       Offset of minimum year into list (by default current year -10)
+	 *  @param  int		    $max_year		Offset of maximum year into list (by default current year + 5)
+	 *  @param	int			$offset			Offset
+	 *  @param	int			$invert			Invert
+	 *  @param	string		$option			Option
+	 *  @param	string		$morecss		More CSS
+	 *  @return	string
+	 */
+	public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
+	{
+		// phpcs:enable
+		print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);
+	}
 
-    /**
-     *	Return HTML combo list of years
-     *
-     *  @param  string	$selected       Preselected value (''=current year, -1=none, year otherwise)
-     *  @param  string	$htmlname       Name of HTML select object
-     *  @param  int	    $useempty       Affiche valeur vide dans liste
-     *  @param  int	    $min_year		Offset of minimum year into list (by default current year -10)
-     *  @param  int	    $max_year       Offset of maximum year into list (by default current year + 5)
-     *  @param	int		$offset			Offset
-     *  @param	int		$invert			Invert
-     *  @param	string	$option			Option
-     *  @param	string	$morecss		More css
-     *  @return	string
-     */
-    public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
-    {
-        $out = '';
+	/**
+	 *	Return HTML combo list of years
+	 *
+	 *  @param  string	$selected       Preselected value (''=current year, -1=none, year otherwise)
+	 *  @param  string	$htmlname       Name of HTML select object
+	 *  @param  int	    $useempty       Affiche valeur vide dans liste
+	 *  @param  int	    $min_year		Offset of minimum year into list (by default current year -10)
+	 *  @param  int	    $max_year       Offset of maximum year into list (by default current year + 5)
+	 *  @param	int		$offset			Offset
+	 *  @param	int		$invert			Invert
+	 *  @param	string	$option			Option
+	 *  @param	string	$morecss		More css
+	 *  @param  bool	$addjscombo		Add js combo
+	 *  @return	string
+	 */
+	public function selectyear($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp', $addjscombo = false)
+	{
+		$out = '';
 
-        $currentyear = date("Y") + $offset;
-        $max_year = $currentyear + $max_year;
-        $min_year = $currentyear - $min_year;
-        if (empty($selected) && empty($useempty)) $selected = $currentyear;
+		// Add code for jquery to use multiselect
+		if ($addjscombo)
+		{
+			// Enhance with select2
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname);
+		}
 
-        $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';
-        if ($useempty)
-        {
-        	$selected_html = '';
-            if ($selected == '') $selected_html = ' selected';
-            $out .= '<option value=""'.$selected_html.'>&nbsp;</option>';
-        }
-        if (!$invert)
-        {
-            for ($y = $max_year; $y >= $min_year; $y--)
-            {
-                $selected_html = '';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
-                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
-            }
-        } else {
-            for ($y = $min_year; $y <= $max_year; $y++)
-            {
-                $selected_html = '';
-                if ($selected > 0 && $y == $selected) $selected_html = ' selected';
-                $out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
-            }
-        }
-        $out .= "</select>\n";
+		$currentyear = date("Y") + $offset;
+		$max_year = $currentyear + $max_year;
+		$min_year = $currentyear - $min_year;
+		if (empty($selected) && empty($useempty)) $selected = $currentyear;
 
-        return $out;
-    }
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$option.' >';
+		if ($useempty)
+		{
+			$selected_html = '';
+			if ($selected == '') $selected_html = ' selected';
+			$out .= '<option value=""'.$selected_html.'>&nbsp;</option>';
+		}
+		if (!$invert)
+		{
+			for ($y = $max_year; $y >= $min_year; $y--)
+			{
+				$selected_html = '';
+				if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
+			}
+		} else {
+			for ($y = $min_year; $y <= $max_year; $y++)
+			{
+				$selected_html = '';
+				if ($selected > 0 && $y == $selected) $selected_html = ' selected';
+				$out .= '<option value="'.$y.'"'.$selected_html.' >'.$y.'</option>';
+			}
+		}
+		$out .= "</select>\n";
+
+		return $out;
+	}
 
 
-    /**
-     * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.
-     *  Class 'Form' must be known.
-     *
-     * 	@param	   User         $user		 Object User
-     * 	@param	   String       $areacode    Code of area for pages - 0 = Home page ... See getListOfPagesForBoxes()
+	/**
+	 * 	Get array with HTML tabs with boxes of a particular area including personalized choices of user.
+	 *  Class 'Form' must be known.
+	 *
+	 * 	@param	   User         $user		 Object User
+	 * 	@param	   String       $areacode    Code of area for pages - 0 = Home page ... See getListOfPagesForBoxes()
 	 *	@return    array                     array('selectboxlist'=>, 'boxactivated'=>, 'boxlista'=>, 'boxlistb'=>)
-     */
-    public static function getBoxesArea($user, $areacode)
-    {
-        global $conf, $langs, $db;
+	 */
+	public static function getBoxesArea($user, $areacode)
+	{
+		global $conf, $langs, $db;
 
-        include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
 
-        $confuserzone = 'MAIN_BOXES_'.$areacode;
+		$confuserzone = 'MAIN_BOXES_'.$areacode;
 
-        // $boxactivated will be array of boxes enabled into global setup
-        // $boxidactivatedforuser will be array of boxes choosed by user
+		// $boxactivated will be array of boxes enabled into global setup
+		// $boxidactivatedforuser will be array of boxes choosed by user
 
-        $selectboxlist = '';
-        $boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
+		$selectboxlist = '';
+		$boxactivated = InfoBox::listBoxes($db, 'activated', $areacode, (empty($user->conf->$confuserzone) ?null:$user), array(), 0); // Search boxes of common+user (or common only if user has no specific setup)
 
-        $boxidactivatedforuser = array();
-        foreach ($boxactivated as $box)
-        {
-        	if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
-        }
+		$boxidactivatedforuser = array();
+		foreach ($boxactivated as $box)
+		{
+			if (empty($user->conf->$confuserzone) || $box->fk_user == $user->id) $boxidactivatedforuser[$box->id] = $box->id; // We keep only boxes to show for user
+		}
 
-        // Define selectboxlist
-        $arrayboxtoactivatelabel = array();
-        if (!empty($user->conf->$confuserzone))
-        {
-        	$boxorder = '';
-        	$langs->load("boxes"); // Load label of boxes
-        	foreach ($boxactivated as $box)
-        	{
-        		if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user
-        		$label = $langs->transnoentitiesnoconv($box->boxlabel);
-        		//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
-        		if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')
-        		{
-        			$label = $label.' <span class="fa fa-bar-chart"></span>';
-        		}
-        		$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list
-        	}
-            foreach ($boxidactivatedforuser as $boxid)
-        	{
-       			if (empty($boxorder)) $boxorder .= 'A:';
+		// Define selectboxlist
+		$arrayboxtoactivatelabel = array();
+		if (!empty($user->conf->$confuserzone))
+		{
+			$boxorder = '';
+			$langs->load("boxes"); // Load label of boxes
+			foreach ($boxactivated as $box)
+			{
+				if (!empty($boxidactivatedforuser[$box->id])) continue; // Already visible for user
+				$label = $langs->transnoentitiesnoconv($box->boxlabel);
+				//if (preg_match('/graph/',$box->class)) $label.=' ('.$langs->trans("Graph").')';
+				if (preg_match('/graph/', $box->class) && $conf->browser->layout != 'phone')
+				{
+					$label = $label.' <span class="fa fa-bar-chart"></span>';
+				}
+				$arrayboxtoactivatelabel[$box->id] = $label; // We keep only boxes not shown for user, to show into combo list
+			}
+			foreach ($boxidactivatedforuser as $boxid)
+			{
+	   			if (empty($boxorder)) $boxorder .= 'A:';
   				$boxorder .= $boxid.',';
-        	}
+			}
 
-        	//var_dump($boxidactivatedforuser);
+			//var_dump($boxidactivatedforuser);
 
-        	// Class Form must have been already loaded
-        	$selectboxlist .= '<!-- Form with select box list -->'."\n";
+			// Class Form must have been already loaded
+			$selectboxlist .= '<!-- Form with select box list -->'."\n";
 			$selectboxlist .= '<form id="addbox" name="addbox" method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 			$selectboxlist .= '<input type="hidden" name="token" value="'.newToken().'">';
 			$selectboxlist .= '<input type="hidden" name="addbox" value="addbox">';
@@ -1054,19 +1071,19 @@ class FormOther
 			$selectboxlist .= '<input type="hidden" name="areacode" value="'.$areacode.'">';
 			$selectboxlist .= '<input type="hidden" name="boxorder" value="'.$boxorder.'">';
 			$selectboxlist .= Form::selectarray('boxcombo', $arrayboxtoactivatelabel, -1, $langs->trans("ChooseBoxToAdd").'...', 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth150onsmartphone', 0, 'hidden selected', 0, 1);
-            if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
-            $selectboxlist .= '</form>';
-            if (!empty($conf->use_javascript_ajax))
-            {
-            	include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-            	$selectboxlist .= ajax_combobox("boxcombo");
-            }
-        }
+			if (empty($conf->use_javascript_ajax)) $selectboxlist .= ' <input type="submit" class="button" value="'.$langs->trans("AddBox").'">';
+			$selectboxlist .= '</form>';
+			if (!empty($conf->use_javascript_ajax))
+			{
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+				$selectboxlist .= ajax_combobox("boxcombo");
+			}
+		}
 
-        // Javascript code for dynamic actions
-        if (!empty($conf->use_javascript_ajax))
-        {
-	        $selectboxlist .= '<script type="text/javascript" language="javascript">
+		// Javascript code for dynamic actions
+		if (!empty($conf->use_javascript_ajax))
+		{
+			$selectboxlist .= '<script type="text/javascript" language="javascript">
 
 	        // To update list of activated boxes
 	        function updateBoxOrder(closing) {
@@ -1105,8 +1122,8 @@ class FormOther
 	        			window.location.search=\'mainmenu='.GETPOST("mainmenu", "aZ09").'&leftmenu='.GETPOST('leftmenu', "aZ09").'&action=addbox&boxid=\'+boxid;
 	                }
 	        	});';
-	        	if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';
-	        	$selectboxlist .= '
+				if (!count($arrayboxtoactivatelabel)) $selectboxlist .= 'jQuery("#boxcombo").hide();';
+				$selectboxlist .= '
 
 	        	jQuery("#boxhalfleft, #boxhalfright").sortable({
 	    	    	handle: \'.boxhandle\',
@@ -1131,144 +1148,144 @@ class FormOther
 
         	});'."\n";
 
-	        $selectboxlist .= '</script>'."\n";
-        }
+			$selectboxlist .= '</script>'."\n";
+		}
 
-        // Define boxlista and boxlistb
-        $nbboxactivated = count($boxidactivatedforuser);
+		// Define boxlista and boxlistb
+		$nbboxactivated = count($boxidactivatedforuser);
 
-        if ($nbboxactivated)
-        {
-        	// Load translation files required by the page
-            $langs->loadLangs(array("boxes", "projects"));
+		if ($nbboxactivated)
+		{
+			// Load translation files required by the page
+			$langs->loadLangs(array("boxes", "projects"));
 
-            $emptybox = new ModeleBoxes($db);
+			$emptybox = new ModeleBoxes($db);
 
-            $boxlista .= "\n<!-- Box left container -->\n";
+			$boxlista .= "\n<!-- Box left container -->\n";
 
-            // Define $box_max_lines
-            $box_max_lines = 5;
-            if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
+			// Define $box_max_lines
+			$box_max_lines = 5;
+			if (!empty($conf->global->MAIN_BOXES_MAXLINES)) $box_max_lines = $conf->global->MAIN_BOXES_MAXLINES;
 
-            $ii = 0;
-            foreach ($boxactivated as $key => $box)
-            {
-            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+			$ii = 0;
+			foreach ($boxactivated as $key => $box)
+			{
+				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
 				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'A'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^A/i', $box->box_order)) // column A
-                {
-                    $ii++;
-                    //print 'box_id '.$boxactivated[$ii]->box_id.' ';
-                    //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
-                    // Show box
-                    $box->loadBox($box_max_lines);
-                    $boxlista .= $box->showBox(null, null, 1);
-                }
-            }
+				if (preg_match('/^A/i', $box->box_order)) // column A
+				{
+					$ii++;
+					//print 'box_id '.$boxactivated[$ii]->box_id.' ';
+					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
+					// Show box
+					$box->loadBox($box_max_lines);
+					$boxlista .= $box->showBox(null, null, 1);
+				}
+			}
 
-            if ($conf->browser->layout != 'phone')
-            {
-            	$emptybox->box_id = 'A';
-            	$emptybox->info_box_head = array();
-            	$emptybox->info_box_contents = array();
-            	$boxlista .= $emptybox->showBox(array(), array(), 1);
-            }
-            $boxlista .= "<!-- End box left container -->\n";
+			if ($conf->browser->layout != 'phone')
+			{
+				$emptybox->box_id = 'A';
+				$emptybox->info_box_head = array();
+				$emptybox->info_box_contents = array();
+				$boxlista .= $emptybox->showBox(array(), array(), 1);
+			}
+			$boxlista .= "<!-- End box left container -->\n";
 
-            $boxlistb .= "\n<!-- Box right container -->\n";
+			$boxlistb .= "\n<!-- Box right container -->\n";
 
-            $ii = 0;
-            foreach ($boxactivated as $key => $box)
-            {
-            	if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
-            	if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
-            	if (preg_match('/^B/i', $box->box_order)) // colonne B
-                {
-                    $ii++;
-                    //print 'box_id '.$boxactivated[$ii]->box_id.' ';
-                    //print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
-                    // Show box
-                    $box->loadBox($box_max_lines);
-                    $boxlistb .= $box->showBox(null, null, 1);
-                }
-            }
+			$ii = 0;
+			foreach ($boxactivated as $key => $box)
+			{
+				if ((!empty($user->conf->$confuserzone) && $box->fk_user == 0) || (empty($user->conf->$confuserzone) && $box->fk_user != 0)) continue;
+				if (empty($box->box_order) && $ii < ($nbboxactivated / 2)) $box->box_order = 'B'.sprintf("%02d", ($ii + 1)); // When box_order was not yet set to Axx or Bxx and is still 0
+				if (preg_match('/^B/i', $box->box_order)) // colonne B
+				{
+					$ii++;
+					//print 'box_id '.$boxactivated[$ii]->box_id.' ';
+					//print 'box_order '.$boxactivated[$ii]->box_order.'<br>';
+					// Show box
+					$box->loadBox($box_max_lines);
+					$boxlistb .= $box->showBox(null, null, 1);
+				}
+			}
 
-            if ($conf->browser->layout != 'phone')
-            {
-            	$emptybox->box_id = 'B';
-            	$emptybox->info_box_head = array();
-            	$emptybox->info_box_contents = array();
-            	$boxlistb .= $emptybox->showBox(array(), array(), 1);
-            }
+			if ($conf->browser->layout != 'phone')
+			{
+				$emptybox->box_id = 'B';
+				$emptybox->info_box_head = array();
+				$emptybox->info_box_contents = array();
+				$boxlistb .= $emptybox->showBox(array(), array(), 1);
+			}
 
-            $boxlistb .= "<!-- End box right container -->\n";
-        }
+			$boxlistb .= "<!-- End box right container -->\n";
+		}
 
-        return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
-    }
+		return array('selectboxlist'=>count($boxactivated) ? $selectboxlist : '', 'boxactivated'=>$boxactivated, 'boxlista'=>$boxlista, 'boxlistb'=>$boxlistb);
+	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Return a HTML select list of a dictionary
-     *
-     *  @param  string	$htmlname          	Name of select zone
-     *  @param	string	$dictionarytable	Dictionary table
-     *  @param	string	$keyfield			Field for key
-     *  @param	string	$labelfield			Label field
-     *  @param	string	$selected			Selected value
-     *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
-     *  @param  string  $moreattrib         More attributes on HTML select tag
-     * 	@return	void
-     */
-    public function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')
-    {
-        // phpcs:enable
-        global $langs, $conf;
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return a HTML select list of a dictionary
+	 *
+	 *  @param  string	$htmlname          	Name of select zone
+	 *  @param	string	$dictionarytable	Dictionary table
+	 *  @param	string	$keyfield			Field for key
+	 *  @param	string	$labelfield			Label field
+	 *  @param	string	$selected			Selected value
+	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
+	 *  @param  string  $moreattrib         More attributes on HTML select tag
+	 * 	@return	void
+	 */
+	public function select_dictionary($htmlname, $dictionarytable, $keyfield = 'code', $labelfield = 'label', $selected = '', $useempty = 0, $moreattrib = '')
+	{
+		// phpcs:enable
+		global $langs, $conf;
 
-        $langs->load("admin");
+		$langs->load("admin");
 
-        $sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
-        $sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
-        $sql .= " ORDER BY ".$labelfield;
+		$sql = "SELECT rowid, ".$keyfield.", ".$labelfield;
+		$sql .= " FROM ".MAIN_DB_PREFIX.$dictionarytable;
+		$sql .= " ORDER BY ".$labelfield;
 
-        dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $num = $this->db->num_rows($result);
-            $i = 0;
-            if ($num)
-            {
-                print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
-                if ($useempty == 1 || ($useempty == 2 && $num > 1))
-                {
-                    print '<option value="-1">&nbsp;</option>';
-                }
+		dol_syslog(get_class($this)."::select_dictionary", LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			if ($num)
+			{
+				print '<select id="select'.$htmlname.'" class="flat selectdictionary" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				if ($useempty == 1 || ($useempty == 2 && $num > 1))
+				{
+					print '<option value="-1">&nbsp;</option>';
+				}
 
-                while ($i < $num)
-                {
-                    $obj = $this->db->fetch_object($result);
-                    if ($selected == $obj->rowid || $selected == $obj->$keyfield)
-                    {
-                        print '<option value="'.$obj->$keyfield.'" selected>';
-                    } else {
-                        print '<option value="'.$obj->$keyfield.'">';
-                    }
-                    print $obj->$labelfield;
-                    print '</option>';
-                    $i++;
-                }
-                print "</select>";
-            } else {
-                print $langs->trans("DictionaryEmpty");
-            }
-        } else {
-            dol_print_error($this->db);
-        }
-    }
+				while ($i < $num)
+				{
+					$obj = $this->db->fetch_object($result);
+					if ($selected == $obj->rowid || $selected == $obj->$keyfield)
+					{
+						print '<option value="'.$obj->$keyfield.'" selected>';
+					} else {
+						print '<option value="'.$obj->$keyfield.'">';
+					}
+					print $obj->$labelfield;
+					print '</option>';
+					$i++;
+				}
+				print "</select>";
+			} else {
+				print $langs->trans("DictionaryEmpty");
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 
-    /**
+	/**
 	 *	Return an html string with a select combo box to choose yes or no
 	 *
 	 *	@param	string		$htmlname		Name of html select field
@@ -1278,7 +1295,7 @@ class FormOther
 	 *  @param	int      	$useempty		1=Add empty line
 	 *	@return	string						See option
 	 */
-    public function selectAutoManual($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
+	public function selectAutoManual($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0)
 	{
 		global $langs;
 
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 6fad72862c7..1e5558546da 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -170,7 +170,7 @@ class FormProjets
 			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 			elseif ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 			{
-				$sql .= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
+				$sql .= " AND (p.fk_soc IN (".$socid.", ".((int) $conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY).") OR p.fk_soc IS NULL)";
 			}
 		}
 		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
@@ -261,7 +261,8 @@ class FormProjets
 								'key' => (int) $obj->rowid,
 								'value' => $obj->ref,
 								'ref' => $obj->ref,
-								'label' => $labeltoshow,
+								'labelx' => $labeltoshow,
+								'label' => ((bool) $disabled) ? '<span class="opacitymedium">'.$labeltoshow.'</span>' : $labeltoshow,
 								'disabled' => (bool) $disabled
 							);
 						}
@@ -297,7 +298,7 @@ class FormProjets
 	 *	@param	int		$maxlength		Maximum length of label
 	 *	@param	int		$option_only	Return only html options lines without the select tag
 	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
-	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
+	 *  @param	int		$discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable)
 	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
 	 *  @param	int		$disabled		Disabled
 	 *  @param	string	$morecss        More css added to the select component
@@ -348,12 +349,12 @@ class FormProjets
 		if ($resql)
 		{
 			// Use select2 selector
-			if (!empty($conf->use_javascript_ajax))
+			if (empty($option_only) && !empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
 				$out .= $comboenhancement;
-				$morecss = 'minwidth200imp maxwidth500';
+				$morecss = 'minwidth200 maxwidth500';
 			}
 
 			if (empty($option_only)) {
@@ -368,6 +369,7 @@ class FormProjets
 				} else $out .= '&nbsp;';
 				$out .= '</option>';
 			}
+
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -388,6 +390,18 @@ class FormProjets
 
 						$labeltoshow = '';
 
+						$disabled = 0;
+						if ($obj->fk_statut == Project::STATUS_DRAFT)
+						{
+							$disabled = 1;
+						} elseif ($obj->fk_statut == Project::STATUS_CLOSED)
+						{
+							if ($discard_closed == 2) $disabled = 1;
+						} elseif ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						{
+							$disabled = 1;
+						}
+
 						if ($showproject == 'all')
 						{
 							$labeltoshow .= dol_trunc($obj->ref, 18); // Project ref
diff --git a/htdocs/core/class/html.formpropal.class.php b/htdocs/core/class/html.formpropal.class.php
index e1653444960..730133eae27 100644
--- a/htdocs/core/class/html.formpropal.class.php
+++ b/htdocs/core/class/html.formpropal.class.php
@@ -102,7 +102,7 @@ class FormPropal
             }
         }
 
-        print '<select class="flat" name="'.$htmlname.'">';
+        print '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';
         if ($showempty) print '<option value="-1">&nbsp;</option>';
 
         foreach ($listofstatus as $key => $obj)
@@ -135,5 +135,7 @@ class FormPropal
             $i++;
         }
         print '</select>';
+
+        print ajax_combobox($htmlname);
     }
 }
diff --git a/htdocs/core/class/html.formsocialcontrib.class.php b/htdocs/core/class/html.formsocialcontrib.class.php
index b5adfdba82f..e3a063b0d69 100644
--- a/htdocs/core/class/html.formsocialcontrib.class.php
+++ b/htdocs/core/class/html.formsocialcontrib.class.php
@@ -59,17 +59,18 @@ class FormSocialContrib
      * 	@param	int		$maxlen			Max length of text in combo box
      * 	@param	int		$help			Add or not the admin help picto
      *  @param	string	$morecss		Add more CSS on select
+     *  @param	int		$noerrorifempty	No print error if list is empty for the country
      * 	@return	void
      */
-    public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300')
+    public function select_type_socialcontrib($selected = '', $htmlname = 'actioncode', $useempty = 0, $maxlen = 40, $help = 1, $morecss = 'minwidth300', $noerrorifempty = 0)
     {
         // phpcs:enable
         global $conf, $db, $langs, $user, $mysoc;
 
         if (empty($mysoc->country_id) && empty($mysoc->country_code))
         {
-            dol_print_error('', 'Call to select_type_socialcontrib with mysoc country not yet defined');
-            exit;
+        	print $langs->trans("ErrorSetupOfCountryMustBeDone");
+			return;
         }
 
         if (!empty($mysoc->country_id))
@@ -110,7 +111,7 @@ class FormSocialContrib
                 if ($user->admin && $help) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
                 if (!empty($conf->use_javascript_ajax)) print ajax_combobox($htmlname);
             } else {
-                print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
+            	if (empty($noerrorifempty)) print $langs->trans("ErrorNoSocialContributionForSellerCountry", $mysoc->country_code);
             }
         } else {
         	dol_print_error($this->db);
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 3c0c6bd9389..8695ef88ef4 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -173,6 +173,7 @@ class Menubase
 		global $conf, $langs;
 
 		// Clean parameters
+		if (!isset($this->enabled)) $this->enabled = '1';
 		$this->menu_handler = trim($this->menu_handler);
 		$this->module = trim($this->module);
 		$this->type = trim($this->type);
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index cb290a49c07..8af9f7bbc25 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -90,7 +90,7 @@ abstract class DoliDB implements Database
     public function idate($param)
 	{
 		// TODO GMT $param should be gmt, so we should add tzouptut to 'gmt'
-		return dol_print_date($param, "%Y-%m-%d %H:%M:%S");
+		return dol_print_date($param, "%Y-%m-%d %H:%M:%S", 'tzserver');
 	}
 
 	/**
@@ -106,12 +106,17 @@ abstract class DoliDB implements Database
 	/**
 	 * Sanitize a string for SQL forging
 	 *
-	 * @param   string $stringtosanitize 	String to escape
+	 * @param   string 	$stringtosanitize 	String to escape
+	 * @param   int		$allowsimplequote 	Allow simple quote
 	 * @return  string                      String escaped
 	 */
-	public function sanitize($stringtosanitize)
+	public function sanitize($stringtosanitize, $allowsimplequote = 0)
 	{
-		return preg_replace('/[^a-z0-9_\-\.,]/i', '', $stringtosanitize);
+		if ($allowsimplequote) {
+			return preg_replace('/[^a-z0-9_\-\.,\']/i', '', $stringtosanitize);
+		} else {
+			return preg_replace('/[^a-z0-9_\-\.,]/i', '', $stringtosanitize);
+		}
 	}
 
 	/**
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 3c49bcf6f4b..d24b4e98189 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -234,8 +234,11 @@ class DoliDBPgsql extends DoliDB
     			// on update defaulted by now
     			$line = preg_replace('/(\s*)tms(\s*)timestamp/i', '\\1tms timestamp without time zone DEFAULT now() NOT NULL', $line);
 
+    			// nuke DEFAULT CURRENT_TIMESTAMP
+    			$line = preg_replace('/(\s*)DEFAULT(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
+
     			// nuke ON UPDATE CURRENT_TIMESTAMP
-    			$line = preg_replace('/(\s*)on(\s*)update(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
+    			$line = preg_replace('/(\s*)ON(\s*)UPDATE(\s*)CURRENT_TIMESTAMP/i', '\\1', $line);
 
     			// unique index(field1,field2)
     			if (preg_match('/unique index\s*\((\w+\s*,\s*\w+)\)/i', $line))
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index a95e3556405..8ecca4da2df 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -77,10 +77,10 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
                 data: { time_js_next_test: time_js_next_test, forcechecknow: 1, token: 'notrequired' },
                 dataType: "json",
                 success: function (result) {
-                	console.log(result);
+                	//console.log(result);
                     var arrayofpastreminders = Object.values(result.pastreminders);
-                    console.log("arrayofpastreminders.length"+arrayofpastreminders.length);
                     if (arrayofpastreminders && arrayofpastreminders.length > 0) {
+	                    console.log("Retreived "+arrayofpastreminders.length+" reminders to do.");
                     	var audio = null;
                         <?php
 						if (!empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
@@ -145,7 +145,7 @@ if (!($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root.'/' || $_SERVER['HTTP
 			                data: { time_js_next_test: time_js_next_test, token: 'notrequired' }
 			            });
                     } else {
-                    	console.log("No past reminder found, next try at "+time_js_next_test);
+                    	console.log("No reminder to do found, next search at "+time_js_next_test);
                     }
                 }
             });
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 038b4be27a6..49ababf4a25 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -45,7 +45,7 @@ function versiontostring($versionarray)
 /**
  *	Compare 2 versions (stored into 2 arrays).
  *  To check if Dolibarr version is lower than (x,y,z), do "if versioncompare(versiondolibarrarray(), array(x.y.z)) <= 0"
- *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,-4)) >= 0) is true if version is 4.0 alpha or higher.
+ *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,-5)) >= 0) is true if version is 4.0 alpha or higher.
  *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,0)) >= 0) is true if version is 4.0 final or higher.
  *  For example: if (versioncompare(versiondolibarrarray(),array(4,0,1)) >= 0) is true if version is 4.0.1 or higher.
  *  Alternative way to compare: if ((float) DOL_VERSION >= 4.0) is true if version is 4.0 alpha or higher (works only to compare first and second level)
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index 43408a38373..0a4d57658d7 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -157,7 +157,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
  */
 function show_array_actions_to_do($max = 5)
 {
-	global $langs, $conf, $user, $db, $bc, $socid;
+	global $langs, $conf, $user, $db, $socid;
 
 	$now = dol_now();
 
@@ -171,7 +171,7 @@ function show_array_actions_to_do($max = 5)
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action";
     $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE a.entity = ".$conf->entity;
+	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
     $sql .= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep2 > '".$db->idate($now)."'))";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	if ($socid) $sql .= " AND s.rowid = ".$socid;
@@ -223,7 +223,7 @@ function show_array_actions_to_do($max = 5)
             $datep2 = $db->jdate($obj->dp2);
 
             // Date
-			print '<td width="100" class="right">'.dol_print_date($datep, 'day').'&nbsp;';
+			print '<td width="100" class="right tddate">'.dol_print_date($datep, 'day').'&nbsp;';
 			$late = 0;
 			if ($obj->percent == 0 && $datep && $datep < time()) $late = 1;
 			if ($obj->percent == 0 && !$datep && $datep2 && $datep2 < time()) $late = 1;
@@ -256,7 +256,7 @@ function show_array_actions_to_do($max = 5)
  */
 function show_array_last_actions_done($max = 5)
 {
-	global $langs, $conf, $user, $db, $bc, $socid;
+	global $langs, $conf, $user, $db, $socid;
 
 	$now = dol_now();
 
@@ -267,7 +267,7 @@ function show_array_last_actions_done($max = 5)
 	$sql .= " ".MAIN_DB_PREFIX."c_actioncomm as c ON c.id = a.fk_action ";
     $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON a.fk_soc = s.rowid";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	$sql .= " WHERE a.entity = ".$conf->entity;
+	$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
     $sql .= " AND (a.percent >= 100 OR (a.percent = -1 AND a.datep2 <= '".$db->idate($now)."'))";
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
     if ($socid) $sql .= " AND s.rowid = ".$socid;
@@ -315,11 +315,11 @@ function show_array_last_actions_done($max = 5)
 			print '</td>';
 
 			// Date
-			print '<td width="100" class="right">'.dol_print_date($db->jdate($obj->da2), 'day');
+			print '<td width="100" class="right tddate">'.dol_print_date($db->jdate($obj->da2), 'day');
 			print "</td>";
 
-			// Statut
-			print "<td class=\"right\" width=\"14\">".$staticaction->LibStatut($obj->percent, 3)."</td>\n";
+			// Status
+			print '<td class="right" width="14">'.$staticaction->LibStatut($obj->percent, 3)."</td>\n";
 
 			print "</tr>\n";
 			$i++;
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index d7b5773e1c2..56b23722a74 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -1543,6 +1543,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		$contactstatic = new Contact($db);
 
 		$out .= '<form name="listactionsfilter" class="listactionsfilter" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$out .= '<input type="hidden" name="token" value="'.newToken().'">';
 		if ($objcon && get_class($objcon) == 'Contact' &&
 			(is_null($filterobj) || get_class($filterobj) == 'Societe'))
 		{
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 3b0cef1a809..1f22e464358 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -146,30 +146,30 @@ function ecm_prepare_head_fm($object)
  */
 function ecm_admin_prepare_head()
 {
-    global $langs, $conf;
-    $langs->load("ecm");
+	global $langs, $conf;
+	$langs->load("ecm");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/ecm.php";
-    $head[$h][1] = $langs->trans("Setup");
-    $head[$h][2] = 'ecm';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/ecm.php";
+	$head[$h][1] = $langs->trans("Setup");
+	$head[$h][2] = 'ecm';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/ecm_files_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsEcmFiles");
-    $head[$h][2] = 'attributes_ecm_files';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ecm_files_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsEcmFiles");
+	$head[$h][2] = 'attributes_ecm_files';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT.'/admin/ecm_directories_extrafields.php';
-    $head[$h][1] = $langs->trans("ExtraFieldsEcmDirectories");
-    $head[$h][2] = 'attributes_ecm_directories';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/admin/ecm_directories_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsEcmDirectories");
+	$head[$h][2] = 'attributes_ecm_directories';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin');
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'ecm_admin', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 7f2fd4ce70d..d926e6105a1 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -1506,9 +1506,10 @@ function dol_init_file_process($pathtoscan = '', $trackid = '')
  * @param	string	$link					Link to add (to add a link instead of a file)
  * @param   string  $trackid                Track id (used to prefix name of session vars to avoid conflict)
  * @param	int		$generatethumbs			1=Generate also thumbs for uploaded image files
+ * @param   Object  $object                 Object used to set 'src_object_*' fields
  * @return	int                             <=0 if KO, >0 if OK
  */
-function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1)
+function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesession = 0, $varfiles = 'addedfile', $savingdocmask = '', $link = null, $trackid = '', $generatethumbs = 1, $object = null)
 {
 	global $db, $user, $conf, $langs;
 
@@ -1533,7 +1534,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 			$nbok = 0;
 			for ($i = 0; $i < $nbfile; $i++)
 			{
-				if (empty($TFile['name'][$i])) continue;		// For example, when submitting a form with no file name
+				if (empty($TFile['name'][$i])) continue; // For example, when submitting a form with no file name
 
 				// Define $destfull (path to file including filename) and $destfile (only filename)
 				$destfull = $upload_dir."/".$TFile['name'][$i];
@@ -1602,7 +1603,7 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 					// Update index table of files (llx_ecm_files)
 					if ($donotupdatesession == 1)
 					{
-						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0);
+						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0, $object);
 						if ($result < 0)
 						{
 							if ($allowoverwrite) {
@@ -1718,9 +1719,10 @@ function dol_remove_file_process($filenb, $donotupdatesession = 0, $donotdeletef
  *  @param		string	$fullpathorig	Full path of origin for file (can be '')
  *  @param		string	$mode			How file was created ('uploaded', 'generated', ...)
  *  @param		int		$setsharekey	Set also the share key
+ *  @param      Object  $object         Object used to set 'src_object_*' fields
  *	@return		int						<0 if KO, 0 if nothing done, >0 if OK
  */
-function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0)
+function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uploaded', $setsharekey = 0, $object = null)
 {
 	global $db, $user;
 
@@ -1743,6 +1745,12 @@ function addFileIntoDatabaseIndex($dir, $file, $fullpathorig = '', $mode = 'uplo
 		$ecmfile->gen_or_uploaded = $mode;
 		$ecmfile->description = ''; // indexed content
 		$ecmfile->keyword = ''; // keyword content
+
+        if (is_object($object) && $object->id > 0) {
+            $ecmfile->src_object_id = $object->id;
+            $ecmfile->src_object_type = $object->table_element;
+        }
+
 		if ($setsharekey)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -2053,7 +2061,7 @@ function dol_uncompress($inputfile, $outputdir)
 			for ($i = 0; $i < $zip->numFiles; $i++) {
 				if (preg_match('/\.\./', $zip->getNameIndex($i))) {
 					dol_syslog("Warning: Try to unzip a file with a transversal path ".$zip->getNameIndex($i), LOG_WARNING);
-					continue;	// Discard the file
+					continue; // Discard the file
 				}
 				$zip->extractTo($outputdir.'/', array($zip->getNameIndex($i)));
 			}
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index bdd6b0c976d..00f1f537ac2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -84,8 +84,8 @@ function getEntity($element, $shared = 1, $currentobject = null)
 
 	// fix different element names (France to English)
 	switch ($element) {
-		case 'contrat':			$element = 'contract';			break;	// "/contrat/class/contrat.class.php"
-		case 'order_supplier':	$element = 'supplier_order';	break;	// "/fourn/class/fournisseur.commande.class.php"
+		case 'contrat':			$element = 'contract'; break; // "/contrat/class/contrat.class.php"
+		case 'order_supplier':	$element = 'supplier_order'; break; // "/fourn/class/fournisseur.commande.class.php"
 	}
 
 	if (is_object($mc))
@@ -664,8 +664,7 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 			}
 			break;
 		case 'restricthtml':		// Recommended for most html textarea
-			$out = dol_string_onlythesehtmltags($out, 0);
-			// TODO We can also remove all javascripts reference
+			$out = dol_string_onlythesehtmltags($out, 0, 1, 1);
 			break;
 		case 'custom':
 			if (empty($filter)) return 'BadFourthParameterForGETPOST';
@@ -1001,17 +1000,25 @@ function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')
 
 
 /**
- *	Clean a string from all non printable ascii chars (0x00-0x1F and 0x7F). It removes also CR-LF
+ *	Clean a string from all non printable ASCII chars (0x00-0x1F and 0x7F). It can also removes also Tab-CR-LF. UTF8 chars remains.
  *  This can be used to sanitize a string and view its real content. Some hacks try to obfuscate attacks by inserting non printable chars.
- *
+ *  Note, for information: UTF8 on 1 byte are: \x00-\7F
+ *                                 2 bytes are: byte 1 \xc0-\xdf, byte 2 = \x80-\xbf
+ *                                 3 bytes are: byte 1 \xe0-\xef, byte 2 = \x80-\xbf, byte 3 = \x80-\xbf
+ *                                 4 bytes are: byte 1 \xf0-\xf7, byte 2 = \x80-\xbf, byte 3 = \x80-\xbf, byte 4 = \x80-\xbf
  *	@param	string	$str            	String to clean
+ *  @param	int		$removetabcrlf		Remove also CR-LF
  * 	@return string          			Cleaned string
  *
  * 	@see    		dol_sanitizeFilename(), dol_string_unaccent(), dol_string_nospecial()
  */
-function dol_string_nounprintableascii($str)
+function dol_string_nounprintableascii($str, $removetabcrlf = 1)
 {
-	return preg_replace('/[\x00-\x1F\x7F]/u', '', $str);
+	if ($removetabcrlf) {
+		return preg_replace('/[\x00-\x1F\x7F]/u', '', $str);	// /u operator makes UTF8 valid characters being ignored so are not included into the replace
+	} else {
+		return preg_replace('/[\x00-\x08\x11-\x12\x14-\x1F\x7F]/u', '', $str);	// /u operator should make UTF8 valid characters being ignored so are not included into the replace
+	}
 }
 
 
@@ -1209,6 +1216,38 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 	}
 }
 
+/**
+ *	Return HTML code to output a button to open a dialog popup box.
+ *  Such buttons must be included inside a HTML form.
+ *
+ *	@param	string	$name				A name for the html component
+ *	@param	string	$label 	    		Label of button
+ *	@param  string	$buttonstring  		button string
+ *	@param  string	$url				Url to open
+ *  @param	string	$disabled			Disabled text
+ * 	@return	string						HTML component with button
+ */
+function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '')
+{
+	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
+	$out = '<a class="button bordertransp button_'.$name.'"'.$disabled.' title="'.dol_escape_htmltag($label).'">'.$buttonstring.'</a>';
+	$out .= '<script language="javascript">
+				 jQuery(document).ready(function () {
+					 jQuery(".button_'.$name.'").click(function () {
+						 var $dialog = $(\'<div></div>\').html(\'<iframe class="iframedialog" style="border: 0px;" src="'.DOL_URL_ROOT.$url.'" width="100%" height="98%"></iframe>\')
+						 .dialog({
+						 	autoOpen: false,
+						 	modal: true,
+						 	height: (window.innerHeight - 150),
+						 	width: \'80%\',
+						 	title: "'.dol_escape_js($label).'"
+						 });
+						 $dialog.dialog(\'open\');
+					 });
+				 });
+				 </script>';
+	return $out;
+}
 
 /**
  *	Show tab header of a card
@@ -1224,6 +1263,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *  @param	int		$limittoshow		Limit number of tabs to show. Use 0 to use automatic default value.
  *  @param	string	$moretabssuffix		A suffix to use when you have several dol_get_fiche_head() in same page
  * 	@return	void
+ *  @deprecated Use print dol_get_fiche_head() instead
  */
 function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0, $moretabssuffix = '')
 {
@@ -1371,7 +1411,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$tabsname = $moretabssuffix;
 		if (empty($tabsname)) { $tabsname = str_replace("@", "", $picto); }
 		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
-		$out .= '<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>';	// Do not use "reposition" class in the "More".
+		$out .= '<a href="#" class="tab moretab inline-block tabunactive">'.$langs->trans("More").'... ('.$nbintab.')</a>'; // Do not use "reposition" class in the "More".
 		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
 		$out .= $outmore;
 		$out .= '</div>';
@@ -1382,7 +1422,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		$out .= "$('#moretabs".$tabsname."').mouseenter( function() {
 			var x = this.offsetLeft, y = this.offsetTop;
 			console.log('mouseenter ".$left." x='+x+' y='+y+' window.innerWidth='+window.innerWidth);
-			if ((window.innerWidth - x) < ".($widthofpopup+10).") {
+			if ((window.innerWidth - x) < ".($widthofpopup + 10).") {
 				$('#moretabsList".$tabsname."').css('".$right."','8px');
 			}
 			$('#moretabsList".$tabsname."').css('".$left."','auto');
@@ -1489,8 +1529,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		$showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);
 		$maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);
 		if ($conf->browser->layout == 'phone') $maxvisiblephotos = 1;
-		if ($showimage) $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
-		else {
+		if ($showimage) {
+			$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';
+		} else {
 			if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {
 				$nophoto = '';
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';
@@ -1572,14 +1613,14 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 
 					if ($pdfexists && !$error)
 					{
-						$heightforphotref = 70;
+						$heightforphotref = 80;
 						if (!empty($conf->dol_optimize_smallscreen)) $heightforphotref = 60;
 						// If the preview file is found
 						if (file_exists($fileimage))
 						{
-							$phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
+							$phototoshow = '<div class="photoref">';
 							$phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';
-							$phototoshow .= '</div></div>';
+							$phototoshow .= '</div>';
 						}
 					}
 				} elseif (!$phototoshow)
@@ -2011,15 +2052,13 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
 
 /**
  *  Return an array with locale date info.
- *  PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows
- *  WARNING: This function always use PHP server timezone to return locale informations !!!
- *  Usage must be avoid.
- *  FIXME: Replace this with PHP date function and a parameter $gm
+ *  WARNING: This function use PHP server timezone by default to return locale informations.
+ *  Be aware to add the third parameter to "UTC" if you need to work on UTC.
  *
  *	@param	int			$timestamp      Timestamp
- *	@param	boolean		$fast           Fast mode
+ *	@param	boolean		$fast           Fast mode. deprecated.
+ *  @param	string		$forcetimezone	'' to use the PHP server timezone. Or use a form like 'Europe/Paris' or '+0200' to force timezone.
  *	@return	array						Array of informations
- *										If no fast mode:
  *										'seconds' => $secs,
  *										'minutes' => $min,
  *										'hours' => $hour,
@@ -2027,34 +2066,42 @@ function dol_print_date($time, $format = '', $tzoutput = 'tzserver', $outputlang
  *										'wday' => $dow,		0=sunday, 6=saturday
  *										'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)),
- *										If fast mode:
- *										'seconds' => $secs,
- *										'minutes' => $min,
- *										'hours' => $hour,
- *										'mday' => $day,
- *										'mon' => $month,
- *										'year' => $year,
- *										'yday' => floor($secsInYear/$_day_power),
- *										'leap' => $leaf,
- *										'ndays' => $ndays
+ *										'yday' => floor($secsInYear/$_day_power)
+ *										'0' => original timestamp
  * 	@see 								dol_print_date(), dol_stringtotime(), dol_mktime()
  */
-function dol_getdate($timestamp, $fast = false)
+function dol_getdate($timestamp, $fast = false, $forcetimezone = '')
 {
 	global $conf;
 
-	$usealternatemethod = false;
-	if ($timestamp <= 0) $usealternatemethod = true; // <= 1970
-	if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038
-
-	if ($usealternatemethod)
-	{
-		$arrayinfo = adodb_getdate($timestamp, $fast);
+	if (empty($conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE)) {
+		//$datetimeobj = new DateTime('@'.$timestamp);
+		$datetimeobj = new DateTime();
+		$datetimeobj->setTimestamp($timestamp);	// Use local PHP server timezone
+		if ($forcetimezone) $datetimeobj->setTimezone(new DateTimeZone($forcetimezone));		//  (add timezone relative to the date entered)
+		$arrayinfo = array(
+			'year'=>((int) date_format($datetimeobj, 'Y')),
+			'mon'=>((int) date_format($datetimeobj, 'm')),
+			'mday'=>((int) date_format($datetimeobj, 'd')),
+			'wday'=>((int) date_format($datetimeobj, 'w')),
+			'yday'=>((int) date_format($datetimeobj, 'z')),
+			'hours'=>((int) date_format($datetimeobj, 'H')),
+			'minutes'=>((int) date_format($datetimeobj, 'i')),
+			'seconds'=>((int) date_format($datetimeobj, 's')),
+			'0'=>$timestamp
+		);
 	} else {
-		$arrayinfo = getdate($timestamp);
+		// PHP getdate is restricted to the years 1901-2038 on Unix and 1970-2038 on Windows
+		$usealternatemethod = false;
+		if ($timestamp <= 0) $usealternatemethod = true; // <= 1970
+		if ($timestamp >= 2145913200) $usealternatemethod = true; // >= 2038
+
+		if ($usealternatemethod)
+		{
+			$arrayinfo = adodb_getdate($timestamp, $fast);
+		} else {
+			$arrayinfo = getdate($timestamp);
+		}
 	}
 
 	return $arrayinfo;
@@ -2775,7 +2822,7 @@ function getUserRemoteIP()
 			$ip = $_SERVER['HTTP_CLIENT_IP']; // value is clean here
 		}
 	} else {
-		$ip = $_SERVER['HTTP_X_FORWARDED_FOR'];	// value is clean here
+		$ip = $_SERVER['HTTP_X_FORWARDED_FOR']; // value is clean here
 	}
 	return $ip;
 }
@@ -3100,7 +3147,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'folder', 'folder-open', 'globe', 'globe-americas', 'grip', 'grip_title',
 				'help', 'holiday',
 				'intervention', 'label', 'language', 'list', 'listlight', 'lot',
-				'map-marker-alt', 'money-bill-alt', 'mrp', 'note',
+				'map-marker-alt', 'money-bill-alt', 'mrp', 'note', 'next',
 				'object_accounting', 'object_account', 'object_accountline', 'object_action', 'object_barcode', 'object_bill', 'object_billa', 'object_billd', 'object_bom',
 				'object_category', 'object_conversation', 'object_bookmark', 'object_bug', 'object_dolly', 'object_dollyrevert', 'object_generic', 'object_folder',
 				'object_list-alt', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
@@ -3114,7 +3161,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'object_technic', 'object_ticket', 'object_trip', 'object_user', 'object_group', 'object_member',
 				'object_phoning', 'object_phoning_mobile', 'object_phoning_fax', 'object_email', 'object_website',
 				'off', 'on', 'order',
-				'paiment', 'play', 'playdisabled', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
+				'paiment', 'play', 'playdisabled', 'previous', 'poll', 'printer', 'product', 'propal', 'projecttask', 'stock', 'resize', 'service', 'stats', 'trip',
 				'setup', 'share-alt', 'sign-out', 'split', 'stripe-s', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
 				'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
@@ -3148,10 +3195,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'email'=>'at',
 				'edit'=>'pencil-alt', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
 				'generic'=>'file', 'holiday'=>'umbrella-beach', 'label'=>'layer-group',
-				'member'=>'users', 'mrp'=>'cubes', 'trip'=>'wallet', 'group'=>'users',
+				'member'=>'users', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
+				'trip'=>'wallet', 'group'=>'users',
 				'sign-out'=>'sign-out-alt',
 				'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star', 'bookmark'=>'star',
-				'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
+				'bank'=>'university', 'close_title'=>'times', 'delete'=>'trash', 'edit'=>'pencil-alt', 'filter'=>'filter',
 				'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarmonth'=>'calendar-alt', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
 				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
 				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
@@ -3159,7 +3207,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'playdisabled'=>'play', 'poll'=>'check-double', 'preview'=>'binoculars', 'project'=>'sitemap', 'projectpub'=>'sitemap', 'projecttask'=>'tasks', 'propal'=>'file-signature',
 				'recruitmentjobposition'=>'id-card-alt', 'recruitmentcandidature'=>'id-badge',
 				'resize'=>'crop', 'supplier_order'=>'dol-order_supplier', 'supplier_proposal'=>'file-signature',
-				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
+				'payment'=>'money-check-alt', 'phoning'=>'phone', 'phoning_mobile'=>'mobile-alt', 'phoning_fax'=>'fax', 'previous'=>'arrow-alt-circle-left', 'printer'=>'print', 'product'=>'cube', 'service'=>'concierge-bell',
 				'refresh'=>'redo', 'resource'=>'laptop-house',
 				'shipment'=>'dolly', 'stock'=>'box-open', 'stats' => 'chart-bar', 'split'=>'code-branch', 'supplier_invoice'=>'file-invoice-dollar', 'technic'=>'cogs', 'ticket'=>'ticket-alt',
 				'title_setup'=>'tools', 'title_accountancy'=>'money-check-alt', 'title_bank'=>'university', 'title_hrm'=>'umbrella-beach',
@@ -4015,7 +4063,7 @@ function dol_print_error($db = '', $error = '', $errors = null)
 	}
 
 	// Return a http error code if possible
-	if (! headers_sent()) {
+	if (!headers_sent()) {
 		http_response_code(500);
 	}
 
@@ -4342,6 +4390,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
 
 	// Right
 	print '<td class="nobordernopadding valignmiddle right">';
+	print '<input type="hidden" name="pageplusoneold" value="'.($page+1).'">';
 	if ($sortfield) $options .= "&sortfield=".urlencode($sortfield);
 	if ($sortorder) $options .= "&sortorder=".urlencode($sortorder);
 	// Show navigation bar
@@ -5575,7 +5624,7 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
 	$temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);
 
 	// We remove entities BEFORE stripping (in case of a separator char is encoded and not the other, the strip will fails)
-	$temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);
+	$temp = dol_html_entity_decode($temp, ENT_COMPAT|ENT_HTML5, $pagecodeto);
 
 	if ($strip_tags) {
 		$temp = strip_tags($temp);
@@ -5604,13 +5653,14 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
  *	Clean a string to keep only desirable HTML tags.
  *
  *	@param	string	$stringtoclean			String to clean
- *  @param	boolean	$cleanalsosomestyles	Remove absolute/fixed positioning from inline styles
- *  @param	boolean	$removeclassattribute	Remove the class attribute from tags
+ *  @param	int		$cleanalsosomestyles	Remove absolute/fixed positioning from inline styles
+ *  @param	int		$removeclassattribute	Remove the class attribute from tags
+ *  @param	int		$cleanalsojavascript	Remove also occurence of (javascript:'
  *	@return string	    					String cleaned
  *
  * 	@see	dol_escape_htmltag() strip_tags() dol_string_nohtmltag() dol_string_neverthesehtmltags()
  */
-function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1, $removeclassattribute = 1)
+function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1, $removeclassattribute = 1, $cleanalsojavascript = 0)
 {
 	$allowed_tags = array(
 		"html", "head", "meta", "body", "article", "a", "abbr", "b", "blockquote", "br", "cite", "div", "dl", "dd", "dt", "em", "font", "img", "ins", "hr", "i", "li", "link",
@@ -5620,22 +5670,29 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 	$allowed_tags_string = join("><", $allowed_tags);
 	$allowed_tags_string = '<'.$allowed_tags_string.'>';
 
-	if ($cleanalsosomestyles) {
-		$stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $stringtoclean); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
-	}
-	if ($removeclassattribute) {
-		$stringtoclean = preg_replace('/(<[^>]+)\s+class=((["\']).*?\\3|\\w*)/i', '\\1', $stringtoclean);
-	}
-	// TODO Remove '/href=("|\'|)javascript/' string ?
+	$stringtoclean = dol_string_nounprintableascii($stringtoclean, 0);
+	$stringtoclean = preg_replace('/&colon;/i', ':', $stringtoclean);
 
 	$temp = strip_tags($stringtoclean, $allowed_tags_string);
 
+	if ($cleanalsosomestyles) {	// Clean for remaining html tags
+		$stringtoclean = preg_replace('/position\s*:\s*(absolute|fixed)\s*!\s*important/i', '', $temp); // Note: If hacker try to introduce css comment into string to bypass this regex, the string must also be encoded by the dol_htmlentitiesbr during output so it become harmless
+	}
+	if ($removeclassattribute) {	// Clean for remaining html tags
+		$stringtoclean = preg_replace('/(<[^>]+)\s+class=((["\']).*?\\3|\\w*)/i', '\\1', $temp);
+	}
+
+	// Remove 'javascript:' that we should not find into a text with
+	if ($cleanalsojavascript) {
+		$temp = preg_replace('/javascript\s*:/i', '', $temp);
+	}
+
 	return $temp;
 }
 
 /**
  *	Clean a string from some undesirable HTML tags.
- *  Note. Not enough secured as dol_string_onlythesehtmltags().
+ *  Note. Not as secured as dol_string_onlythesehtmltags().
  *
  *	@param	string	$stringtoclean			String to clean
  *  @param	array	$disallowed_tags		Array of tags not allowed
@@ -5779,7 +5836,7 @@ function dol_htmlentitiesbr($stringtoencode, $nl2brmode = 0, $pagecodefrom = 'UT
  */
 function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')
 {
-	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);
+	$ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT|ENT_HTML5, $pagecodeto);
 	$ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);
 	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);
 	$ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);
@@ -5803,7 +5860,7 @@ function dol_htmlcleanlastbr($stringtodecode)
  * Replace html_entity_decode functions to manage errors
  *
  * @param   string	$a					Operand a
- * @param   string	$b					Operand b (ENT_QUOTES=convert simple and double quotes)
+ * @param   string	$b					Operand b (ENT_QUOTES|ENT_HTML5=convert simple, double quotes, colon, e accent, ...)
  * @param   string	$c					Operand c
  * @param	string	$keepsomeentities	Entities but &, <, >, " are not converted.
  * @return  string						String decoded
@@ -7800,7 +7857,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 					$numnewcrit = price2num($newcrit);
 					if (is_numeric($numnewcrit))
 					{
-						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$db->sanitize($numnewcrit);	// should be a numeric
+						$newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$db->sanitize($numnewcrit); // should be a numeric
 					} else {
 						$newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false
 					}
@@ -7808,7 +7865,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 				}
 			} elseif ($mode == 2 || $mode == -2)
 			{
-				$crit = preg_replace('/[^0-9,]/', '', $crit);	// ID are always integer
+				$crit = preg_replace('/[^0-9,]/', '', $crit); // ID are always integer
 				$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -2 ? 'NOT ' : '');
 				$newres .= $crit ? "IN (".$db->sanitize($db->escape($crit)).")" : "IN (0)";
 				if ($mode == -2) $newres .= ' OR '.$field.' IS NULL';
@@ -7828,7 +7885,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 							$listofcodes .= "'".$db->escape($val)."'";
 						}
 					}
-					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes).")";
+					$newres .= ($i2 > 0 ? ' OR ' : '').$field." ".($mode == -3 ? 'NOT ' : '')."IN (".$db->sanitize($listofcodes, 1).")";
 					$i2++; // a criteria was added to string
 				}
 				if ($mode == -3) $newres .= ' OR '.$field.' IS NULL';
@@ -8336,7 +8393,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
 
 
 /**
- * Function dolGetStatus
+ * Output the badge of a status.
  *
  * @param   string  $statusLabel       Label of badge no html : use in alt attribute for accessibility
  * @param   string  $statusLabelShort  Short label of badge no html
@@ -8344,7 +8401,7 @@ function dolGetBadge($label, $html = '', $type = 'primary', $mode = '', $url = '
  * @param   string  $statusType        status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name
  * @param   int	    $displayMode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
  * @param   string  $url               The url for link
- * @param   array   $params            Various params for future : recommended rather than adding more function arguments
+ * @param   array   $params            Various params. Example: array('tooltip'=>'...', 'badgeParams'=>...)
  * @return  string                     Html status string
  */
 function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array())
@@ -8413,7 +8470,7 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 		$statusLabelShort = (empty($statusLabelShort) ? $statusLabel : $statusLabelShort);
 
 		$dolGetBadgeParams['attr']['class'] = 'badge-status';
-		$dolGetBadgeParams['attr']['title'] = $statusLabel;
+		$dolGetBadgeParams['attr']['title'] = empty($params['tooltip']) ? $statusLabel : $params['tooltip'];
 
 		if ($displayMode == 3) {
 			$return = dolGetBadge((empty($conf->dol_optimize_smallscreen) ? $statusLabel : (empty($statusLabelShort) ? $statusLabel : $statusLabelShort)), '', $statusType, 'dot', $url, $dolGetBadgeParams);
@@ -8946,8 +9003,8 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
 
 	if ($method == -1) {
 		$method = 0;
-		if (! empty($conf->global->MAIN_FORCE_READFILE_WITH_FREAD)) $method = 1;
-		if (! empty($conf->global->MAIN_FORCE_READFILE_WITH_STREAM_COPY)) $method = 2;
+		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_FREAD)) $method = 1;
+		if (!empty($conf->global->MAIN_FORCE_READFILE_WITH_STREAM_COPY)) $method = 2;
 	}
 
 	// Be sure we don't have output buffering enabled to have readfile working correctly
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 7cc14060aac..0c06d845843 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -66,7 +66,7 @@ function jsUnEscape($source)
 			$pos++;
 		}
 	}
-	return dol_html_entity_decode($decodedStr, ENT_COMPAT);
+	return dol_html_entity_decode($decodedStr, ENT_COMPAT|ENT_HTML5);
 }
 
 
@@ -2384,3 +2384,77 @@ function price2fec($amount)
 
 	return $output;
 }
+
+/**
+ * Check the syntax of some PHP code.
+ *
+ * @param 	string 			$code 	PHP code to check.
+ * @return 	boolean|array 			If false, then check was successful, otherwise an array(message,line) of errors is returned.
+ */
+function phpSyntaxError($code)
+{
+	if (!defined("CR")) define("CR", "\r");
+	if (!defined("LF")) define("LF", "\n");
+	if (!defined("CRLF")) define("CRLF", "\r\n");
+
+	$braces=0;
+	$inString=0;
+	foreach (token_get_all('<?php ' . $code) as $token) {
+		if (is_array($token)) {
+			switch ($token[0]) {
+				case T_CURLY_OPEN:
+				case T_DOLLAR_OPEN_CURLY_BRACES:
+				case T_START_HEREDOC: ++$inString; break;
+				case T_END_HEREDOC:   --$inString; break;
+			}
+		} elseif ($inString & 1) {
+			switch ($token) {
+				case '`':
+				case '\'':
+				case '"': --$inString; break;
+			}
+		} else {
+			switch ($token) {
+				case '`':
+				case '\'':
+				case '"': ++$inString; break;
+				case '{': ++$braces; break;
+				case '}':
+					if ($inString) {
+						--$inString;
+					} else {
+						--$braces;
+						if ($braces < 0) break 2;
+					}
+					break;
+			}
+		}
+	}
+	$inString = @ini_set('log_errors', false);
+	$token = @ini_set('display_errors', true);
+	ob_start();
+	$code = substr($code, strlen('<?php '));
+	$braces || $code = "if(0){{$code}\n}";
+	if (eval($code) === false) {
+		if ($braces) {
+			$braces = PHP_INT_MAX;
+		} else {
+			false !== strpos($code, CR) && $code = strtr(str_replace(CRLF, LF, $code), CR, LF);
+			$braces = substr_count($code, LF);
+		}
+		$code = ob_get_clean();
+		$code = strip_tags($code);
+		if (preg_match("'syntax error, (.+) in .+ on line (\d+)$'s", $code, $code)) {
+			$code[2] = (int) $code[2];
+			$code = $code[2] <= $braces
+			? array($code[1], $code[2])
+			: array('unexpected $end' . substr($code[1], 14), $braces);
+		} else $code = array('syntax error', 0);
+	} else {
+		ob_end_clean();
+		$code = false;
+	}
+	@ini_set('display_errors', $token);
+	@ini_set('log_errors', $inString);
+	return $code;
+}
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 00f628bb0c4..bd392760cc5 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -23,7 +23,7 @@
  */
 
 // Define size of logo small and mini
-$maxwidthsmall = 350; $maxheightsmall = 200; // Near 16/9eme
+$maxwidthsmall = 480; $maxheightsmall = 270; // Near 16/9eme
 $maxwidthmini = 128; $maxheightmini = 72; // 16/9eme
 $quality = 80;
 
diff --git a/htdocs/core/lib/intracommreport.lib.php b/htdocs/core/lib/intracommreport.lib.php
new file mode 100644
index 00000000000..ce63b320983
--- /dev/null
+++ b/htdocs/core/lib/intracommreport.lib.php
@@ -0,0 +1,83 @@
+<?php
+/* <one line to give the program's name and a brief idea of what it does.>
+ * Copyright (C) 2015 ATM Consulting <support@atm-consulting.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\file		htdocs/core/lib/intracommreport.lib.php
+ * 	\ingroup	Intracomm report
+ * 	\brief		Library of intracomm report functions
+ */
+
+/**
+ *	Prepare array with list of admin tabs
+ *
+ *	@return	array					Array of tabs to show
+ */
+function intracommReportAdminPrepareHead()
+{
+    global $langs, $conf;
+
+    $langs->load("intracommreport");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/intracommreport/admin/intracommreport.php';
+    $head[$h][1] = $langs->trans("Parameters");
+    $head[$h][2] = 'general';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+    // $this->tabs = array('entity:-tabname); to remove a tab
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin');
+
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport_admin', 'remove');
+    return $head;
+}
+
+/**
+ *	Prepare array with list of tabs
+ *
+ *  @param   Object	$object		Object related to tabs
+ *
+ *	@return	array					Array of tabs to show
+ */
+function intracommReportPrepareHead($object)
+{
+    global $langs, $conf;
+
+    $langs->load("intracommreport");
+
+    $h = 0;
+    $head = array();
+
+    $head[$h][0] = DOL_URL_ROOT.'/intracommreport/card.php?rowid='.$object->id;
+    $head[$h][1] = $langs->trans("Card");
+    $head[$h][2] = 'card';
+    $h++;
+
+    // Show more tabs from modules
+    // Entries must be declared in modules descriptor with line
+    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__'); to add new tab
+    // $this->tabs = array('entity:-tabname); to remove a tab
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport');
+
+    complete_head_from_modules($conf, $langs, null, $head, $h, 'intracommreport', 'remove');
+    return $head;
+}
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 4fb593e354d..601dad3275d 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -29,30 +29,30 @@
 function payment_prepare_head(Paiement $object)
 {
 
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Payment");
-    $head[$h][2] = 'payment';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Payment");
+	$head[$h][2] = 'payment';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment');
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
-    $head[$h][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/paiement/info.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -64,30 +64,30 @@ function payment_prepare_head(Paiement $object)
  */
 function bankline_prepare_head($id)
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
-    $head[$h][1] = $langs->trans('BankTransaction');
-    $head[$h][2] = 'bankline';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/line.php?rowid='.$id;
+	$head[$h][1] = $langs->trans('BankTransaction');
+	$head[$h][2] = 'bankline';
+	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline');
 
-    $head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;
-    $head[$h][1] = $langs->trans("Info");
-    $head[$h][2] = 'info';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/compta/bank/info.php?rowid='.$id;
+	$head[$h][1] = $langs->trans("Info");
+	$head[$h][2] = 'info';
+	$h++;
 
-    complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'bankline', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -109,11 +109,11 @@ function payment_supplier_prepare_head(Paiement $object)
 	$head[$h][2] = 'payment';
 	$h++;
 
-    // Show more tabs from modules
-    // Entries must be declared in modules descriptor with line
-    // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-    // $this->tabs = array('entity:-tabname);   												to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'payment_supplier');
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/paiement/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans('Info');
@@ -170,7 +170,7 @@ function showOnlinePaymentUrl($type, $ref)
 	global $langs;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array('payment', 'stripe'));
+	$langs->loadLangs(array('payment', 'stripe'));
 
 	$servicename = $langs->transnoentitiesnoconv('Online');
 
@@ -194,7 +194,7 @@ function showOnlinePaymentUrl($type, $ref)
  */
 function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_tag', $localorexternal = 0)
 {
-    global $conf, $dolibarr_main_url_root;
+	global $conf, $dolibarr_main_url_root;
 
 	$ref = str_replace(' ', '', $ref);
 	$out = '';
@@ -209,7 +209,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 
 	if ($type == 'free')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
 		if (!empty($conf->global->PAYMENT_SECURITY_TOKEN))
 		{
 			if (empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYMENT_SECURITY_TOKEN;
@@ -218,7 +218,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		//if ($mode) $out.='&noidempotency=1';
 	} elseif ($type == 'order')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'order_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -234,7 +234,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 	} elseif ($type == 'invoice')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'invoice_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -250,7 +250,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 	} elseif ($type == 'contractline')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'contractline_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -266,7 +266,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 	} elseif ($type == 'member' || $type == 'membersubscription')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'member_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -283,7 +283,7 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 	}
 	if ($type == 'donation')
 	{
-	    $out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=donation&ref='.($mode ? '<font color="#666666">' : '');
 		if ($mode == 1) $out .= 'donation_ref';
 		if ($mode == 0) $out .= urlencode($ref);
 		$out .= ($mode ? '</font>' : '');
@@ -319,82 +319,82 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
  */
 function htmlPrintOnlinePaymentFooter($fromcompany, $langs, $addformmessage = 0, $suffix = '', $object = null)
 {
-    global $conf;
+	global $conf;
 
-    // Juridical status
-    $line1 = "";
-    if ($fromcompany->forme_juridique_code)
-    {
-        $line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
-    }
-    // Capital
-    if ($fromcompany->capital)
-    {
-        $line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
-    }
-    // Prof Id 1
-    if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
-    {
-        $field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
-    }
-    // Prof Id 2
-    if ($fromcompany->idprof2)
-    {
-        $field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
-    }
+	// Juridical status
+	$line1 = "";
+	if ($fromcompany->forme_juridique_code)
+	{
+		$line1 .= ($line1 ? " - " : "").getFormeJuridiqueLabel($fromcompany->forme_juridique_code);
+	}
+	// Capital
+	if ($fromcompany->capital)
+	{
+		$line1 .= ($line1 ? " - " : "").$langs->transnoentities("CapitalOf", $fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency);
+	}
+	// Prof Id 1
+	if ($fromcompany->idprof1 && ($fromcompany->country_code != 'FR' || !$fromcompany->idprof2))
+	{
+		$field = $langs->transcountrynoentities("ProfId1", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof1;
+	}
+	// Prof Id 2
+	if ($fromcompany->idprof2)
+	{
+		$field = $langs->transcountrynoentities("ProfId2", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line1 .= ($line1 ? " - " : "").$field.": ".$fromcompany->idprof2;
+	}
 
-    // Second line of company infos
-    $line2 = "";
-    // Prof Id 3
-    if ($fromcompany->idprof3)
-    {
-        $field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
-    }
-    // Prof Id 4
-    if ($fromcompany->idprof4)
-    {
-        $field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
-        if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
-        $line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
-    }
-    // IntraCommunautary VAT
-    if ($fromcompany->tva_intra != '')
-    {
-        $line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
-    }
+	// Second line of company infos
+	$line2 = "";
+	// Prof Id 3
+	if ($fromcompany->idprof3)
+	{
+		$field = $langs->transcountrynoentities("ProfId3", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof3;
+	}
+	// Prof Id 4
+	if ($fromcompany->idprof4)
+	{
+		$field = $langs->transcountrynoentities("ProfId4", $fromcompany->country_code);
+		if (preg_match('/\((.*)\)/i', $field, $reg)) $field = $reg[1];
+		$line2 .= ($line2 ? " - " : "").$field.": ".$fromcompany->idprof4;
+	}
+	// IntraCommunautary VAT
+	if ($fromcompany->tva_intra != '')
+	{
+		$line2 .= ($line2 ? " - " : "").$langs->transnoentities("VATIntraShort").": ".$fromcompany->tva_intra;
+	}
 
-    print '<br>';
+	print '<br>';
 
-    print '<div class="center">'."\n";
-    if ($addformmessage)
-    {
-    	print '<!-- object = '.$object->element.' -->';
-    	print '<br>';
+	print '<div class="center">'."\n";
+	if ($addformmessage)
+	{
+		print '<!-- object = '.$object->element.' -->';
+		print '<br>';
 
-    	$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
-    	if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    	elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
+		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORM_'.$suffix;
+		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORM)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORM);
 
-    	// Add other message if VAT exists
-    	if ($object->total_vat != 0 || $object->total_tva != 0)
-    	{
-    		$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
-    		if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
-    		elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
-    	}
-    }
+		// Add other message if VAT exists
+		if ($object->total_vat != 0 || $object->total_tva != 0)
+		{
+			$parammessageform = 'ONLINE_PAYMENT_MESSAGE_FORMIFVAT_'.$suffix;
+			if (!empty($conf->global->$parammessageform)) print $langs->transnoentities($conf->global->$parammessageform);
+			elseif (!empty($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT)) print $langs->transnoentities($conf->global->ONLINE_PAYMENT_MESSAGE_FORMIFVAT);
+		}
+	}
 
-    print '<font style="font-size: 10px;"><br><hr>'."\n";
-    print $fromcompany->name.'<br>';
-    print $line1;
-    if (strlen($line1.$line2) > 50) print '<br>';
-    else print ' - ';
-    print $line2;
-    print '</font></div>'."\n";
+	print '<font style="font-size: 10px;"><br><hr>'."\n";
+	print $fromcompany->name.'<br>';
+	print $line1;
+	if (strlen($line1.$line2) > 50) print '<br>';
+	else print ' - ';
+	print $line2;
+	print '</font></div>'."\n";
 }
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 6232afe962e..4156b89a2ab 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -122,7 +122,7 @@ function pdf_getInstance($format = '', $metric = 'mm', $pagetype = 'P')
 		define('K_SMALL_RATIO', 2 / 3);
 		define('K_THAI_TOPCHARS', true);
 		define('K_TCPDF_CALLS_IN_HTML', true);
-		if (! empty($conf->global->TCPDF_THROW_ERRORS_INSTEAD_OF_DIE)) {
+		if (!empty($conf->global->TCPDF_THROW_ERRORS_INSTEAD_OF_DIE)) {
 			define('K_TCPDF_THROW_EXCEPTION_ERROR', true);
 		} else {
 			define('K_TCPDF_THROW_EXCEPTION_ERROR', false);
@@ -1260,7 +1260,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 			// Manage HTML entities description test because $prodser->description is store with htmlentities but $desc no
 			$textwasmodified = false;
 			if (!empty($desc) && dol_textishtml($desc) && !empty($prodser->description) && dol_textishtml($prodser->description)) {
-				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES | ENT_HTML401), dol_html_entity_decode($prodser->description, ENT_QUOTES | ENT_HTML401)) !== false);
+				$textwasmodified = (strpos(dol_html_entity_decode($desc, ENT_QUOTES|ENT_HTML5), dol_html_entity_decode($prodser->description, ENT_QUOTES|ENT_HTML5)) !== false);
 			} else {
 				$textwasmodified = ($desc == $prodser->description);
 			}
@@ -1959,9 +1959,9 @@ function pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails = 0)
     {
 	    if ($object->lines[$i]->special_code == 3)
     	{
-    		return $outputlangs->transnoentities("Option");
+    		$result .= $outputlangs->transnoentities("Option");
     	}
-        if (empty($hidedetails) || $hidedetails > 1)
+        elseif (empty($hidedetails) || $hidedetails > 1)
         {
         	$total_ht = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ht : $object->lines[$i]->total_ht);
         	if ($object->lines[$i]->situation_percent > 0)
@@ -2017,7 +2017,25 @@ function pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails = 0)
 		if ($object->lines[$i]->special_code == 3)
     	{
     		$result .= $outputlangs->transnoentities("Option");
-    	} elseif (empty($hidedetails) || $hidedetails > 1) $result .= price($sign * ($object->lines[$i]->total_ht) + ($object->lines[$i]->total_ht) * ($object->lines[$i]->tva_tx) / 100, 0, $outputlangs);
+    	}
+    	elseif (empty($hidedetails) || $hidedetails > 1)
+    	{
+    		$total_ttc = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1 ? $object->lines[$i]->multicurrency_total_ttc : $object->lines[$i]->total_ttc);
+    		if ($object->lines[$i]->situation_percent > 0)
+    		{
+    			// TODO Remove this. The total should be saved correctly in database instead of being modified here.
+    			$prev_progress = 0;
+    			$progress = 1;
+    			if (method_exists($object->lines[$i], 'get_prev_progress'))
+    			{
+    				$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+    				$progress = ($object->lines[$i]->situation_percent - $prev_progress) / 100;
+    			}
+    			$result .= price($sign * ($total_ttc / ($object->lines[$i]->situation_percent / 100)) * $progress, 0, $outputlangs);
+    		} else {
+    			$result .= price($sign * $total_ttc, 0, $outputlangs);
+    		}
+    	}
 	}
 	return $result;
 }
@@ -2140,11 +2158,11 @@ function pdf_getLinkedObjects($object, $outputlangs)
 			    if (empty($object->linkedObjects['commande']) && $object->element != 'commande')	// There is not already a link to order and object is not the order, so we show also info with order
 			    {
 			        $elementobject->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0);
-			        if (! empty($elementobject->linkedObjectsIds['commande'])){
+			        if (!empty($elementobject->linkedObjectsIds['commande'])) {
 						include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 						$order = new Commande($db);
 						$ret = $order->fetch(reset($elementobject->linkedObjectsIds['commande']));
-						if ($ret < 1) { $order=null; }
+						if ($ret < 1) { $order = null; }
 					}
 			    }
 			    if (!is_object($order))
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index dfc57313add..8c0253e927c 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -346,6 +346,7 @@ function product_lot_admin_prepare_head()
 function show_stats_for_company($product, $socid)
 {
 	global $conf, $langs, $user, $db;
+	$form = new Form($db);
 
 	$nblines = 0;
 
@@ -356,25 +357,7 @@ function show_stats_for_company($product, $socid)
 	print '<td class="right" width="25%">'.$langs->trans("TotalQuantity").'</td>';
 	print '</tr>';
 
-	// MO
-	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
-	{
-		$nblines++;
-		//$ret = $product->load_stats_mo($socid);
-		if ($ret < 0) dol_print_error($db);
-		$langs->load("orders");
-		print '<tr><td>';
-		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';
-		print '</td><td class="right">';
-		print $product->stats_mo['suppliers'];
-		print '</td><td class="right">';
-		print $product->stats_mo['nb'];
-		print '</td><td class="right">';
-		print $product->stats_mo['qty'];
-		print '</td>';
-		print '</tr>';
-	}
-	// Customer proposals
+		// Customer proposals
 	if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 	{
 		$nblines++;
@@ -502,6 +485,61 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 
+	// BOM
+	if (!empty($conf->bom->enabled) && $user->rights->bom->read)
+	{
+		$nblines++;
+		$ret = $product->load_stats_bom($socid);
+		if ($ret < 0) {
+			setEventMessage($product->error, 'errors');
+		}
+		$langs->load("mrp");
+
+		print '<tr><td>';
+		print '<a href="bom.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("BOM").'</a>';
+		print '</td><td class="right">';
+
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_bom['nb_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_bom['nb_toconsume'], $langs->trans("ToConsume"));
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_bom['qty_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_bom['qty_toconsume'], $langs->trans("ToConsume"));
+		print '</td>';
+		print '</tr>';
+	}
+
+
+	// MO
+	if (!empty($conf->mrp->enabled) && $user->rights->mrp->read)
+	{
+		$nblines++;
+		$ret = $product->load_stats_mo($socid);
+		if ($ret < 0) {
+			setEventMessage($product->error, 'errors');
+		}
+		$langs->load("mrp");
+		print '<tr><td>';
+		print '<a href="mo.php?id='.$product->id.'">'.img_object('', 'mrp').' '.$langs->trans("MO").'</a>';
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_mo['customers_toconsume'], $langs->trans("ToConsume"));
+		print $form->textwithpicto($product->stats_mo['customers_consumed'], $langs->trans("QtyAlreadyConsumed"));
+		print $form->textwithpicto($product->stats_mo['customers_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_mo['customers_produced'], $langs->trans("QtyAlreadyProduced"));
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_mo['nb_toconsume'], $langs->trans("ToConsume"));
+		print $form->textwithpicto($product->stats_mo['nb_consumed'], $langs->trans("QtyAlreadyConsumed"));
+		print $form->textwithpicto($product->stats_mo['nb_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_mo['nb_produced'], $langs->trans("QtyAlreadyProduced"));
+		print '</td><td class="right">';
+		print $form->textwithpicto($product->stats_mo['qty_toconsume'], $langs->trans("ToConsume"));
+		print $form->textwithpicto($product->stats_mo['qty_consumed'], $langs->trans("QtyAlreadyConsumed"));
+		print $form->textwithpicto($product->stats_mo['qty_toproduce'], $langs->trans("QtyToProduce"));
+		print $form->textwithpicto($product->stats_mo['qty_produced'], $langs->trans("QtyAlreadyProduced"));
+		print '</td>';
+		print '</tr>';
+	}
+
 	return $nblines++;
 }
 
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 782e18151b2..29a522e7335 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -30,23 +30,23 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 /**
  * Prepare array with list of tabs
  *
- * @param   Object	$object		Object related to tabs
- * @return  array				Array of tabs to show
+ * @param	Project	$project	Object related to tabs
+ * @return	array				Array of tabs to show
  */
-function project_prepare_head($object)
+function project_prepare_head(Project $project)
 {
 	global $db, $langs, $conf, $user;
 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/projet/card.php?id='.$project->id;
 	$head[$h][1] = $langs->trans("Project");
 	$head[$h][2] = 'project';
 	$h++;
 
-	$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
-	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$object->id;
+	$nbContact = count($project->liste_contact(-1, 'internal')) + count($project->liste_contact(-1, 'external'));
+	$head[$h][0] = DOL_URL_ROOT.'/projet/contact.php?id='.$project->id;
 	$head[$h][1] = $langs->trans("ProjectContact");
 	if ($nbContact > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbContact.'</span>';
 	$head[$h][2] = 'contact';
@@ -55,12 +55,12 @@ function project_prepare_head($object)
 	if (empty($conf->global->PROJECT_HIDE_TASKS))
 	{
 		// Then tab for sub level of projet, i mean tasks
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("Tasks");
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic = new Task($db);
-		$nbTasks = count($taskstatic->getTasksArray(0, 0, $object->id, 0, 0));
+		$nbTasks = count($taskstatic->getTasksArray(0, 0, $project->id, 0, 0));
 		if ($nbTasks > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbTasks).'</span>';
 		$head[$h][2] = 'tasks';
 		$h++;
@@ -71,7 +71,7 @@ function project_prepare_head($object)
 		//$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t, ".MAIN_DB_PREFIX."projet_task as pt";
 		$sql .= " WHERE t.fk_task = pt.rowid";
-		$sql .= " AND pt.fk_projet =".$object->id;
+		$sql .= " AND pt.fk_projet =".$project->id;
 		$resql = $db->query($sql);
 		if ($resql)
 		{
@@ -79,7 +79,7 @@ function project_prepare_head($object)
 			if ($obj) $nbTimeSpent = 1;
 		} else dol_print_error($db);
 
-		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$object->id;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/time.php?withproject=1&projectid='.$project->id;
 		$head[$h][1] = $langs->trans("TimeSpent");
 		if ($nbTimeSpent > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">...</span>';
 		$head[$h][2] = 'timespent';
@@ -91,8 +91,32 @@ function project_prepare_head($object)
 		|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
 		|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled))
 	{
-		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$object->id;
+		$count = 0;
+
+		if (!empty($conf->propal->enabled))				$count += $project->getElementCount('propal', 'propal');
+		if (!empty($conf->commande->enabled))			$count += $project->getElementCount('order', 'commande');
+		if (!empty($conf->facture->enabled))			$count += $project->getElementCount('invoice', 'facture');
+		if (!empty($conf->facture->enabled))			$count += $project->getElementCount('invoice_predefined', 'facture_rec');
+		if (!empty($conf->supplier_proposal->enabled))	$count += $project->getElementCount('proposal_supplier', 'supplier_proposal');
+		if (!empty($conf->supplier_order->enabled))		$count += $project->getElementCount('order_supplier', 'commande_fournisseur');
+		if (!empty($conf->supplier_invoice->enabled))	$count += $project->getElementCount('invoice_supplier', 'facture_fourn');
+		if (!empty($conf->contrat->enabled))			$count += $project->getElementCount('contract', 'contrat');
+		if (!empty($conf->ficheinter->enabled))			$count += $project->getElementCount('intervention', 'fichinter');
+		if (!empty($conf->expedition->enabled))			$count += $project->getElementCount('shipping', 'expedition');
+		if (!empty($conf->mrp->enabled))				$count += $project->getElementCount('mrp', 'mrp_mo', 'fk_project');
+		if (!empty($conf->deplacement->enabled))		$count += $project->getElementCount('trip', 'deplacement');
+		if (!empty($conf->expensereport->enabled))		$count += $project->getElementCount('expensereport', 'expensereport');
+		if (!empty($conf->don->enabled))				$count += $project->getElementCount('donation', 'don');
+		if (!empty($conf->loan->enabled))				$count += $project->getElementCount('loan', 'loan');
+		if (!empty($conf->tax->enabled))				$count += $project->getElementCount('chargesociales', 'chargesociales');
+		if (!empty($conf->projet->enabled))				$count += $project->getElementCount('project_task', 'projet_task');
+		if (!empty($conf->stock->enabled))				$count += $project->getElementCount('stock_mouvement', 'stock');
+		if (!empty($conf->salaries->enabled))			$count += $project->getElementCount('salaries', 'payment_salary');
+		if (!empty($conf->banque->enabled))				$count += $project->getElementCount('variouspayment', 'payment_various');
+
+		$head[$h][0] = DOL_URL_ROOT.'/projet/element.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("ProjectOverview");
+		if ($count > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$count.'</span>';
 		$head[$h][2] = 'element';
 		$h++;
 	}
@@ -101,15 +125,15 @@ function project_prepare_head($object)
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project');
+	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project');
 
 
 	if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
 	{
 		$nbNote = 0;
-		if (!empty($object->note_private)) $nbNote++;
-		if (!empty($object->note_public)) $nbNote++;
-		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$object->id;
+		if (!empty($project->note_private)) $nbNote++;
+		if (!empty($project->note_public)) $nbNote++;
+		$head[$h][0] = DOL_URL_ROOT.'/projet/note.php?id='.$project->id;
 		$head[$h][1] = $langs->trans('Notes');
 		if ($nbNote > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
 		$head[$h][2] = 'notes';
@@ -118,10 +142,10 @@ function project_prepare_head($object)
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($project->ref);
 	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$object->id;
+	$nbLinks = Link::count($db, $project->element, $project->id);
+	$head[$h][0] = DOL_URL_ROOT.'/projet/document.php?id='.$project->id;
 	$head[$h][1] = $langs->trans('Documents');
 	if (($nbFiles + $nbLinks) > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
 	$head[$h][2] = 'document';
@@ -130,15 +154,15 @@ function project_prepare_head($object)
 	// Manage discussion
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT))
 	{
-		$nbComments = $object->getNbComments();
-		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$object->id;
+		$nbComments = $project->getNbComments();
+		$head[$h][0] = DOL_URL_ROOT.'/projet/comment.php?id='.$project->id;
 		$head[$h][1] = $langs->trans("CommentLink");
 		if ($nbComments > 0) $head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbComments.'</span>';
 		$head[$h][2] = 'project_comment';
 		$h++;
 	}
 
-	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$project->id;
 	$head[$h][1] .= $langs->trans("Events");
 	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read)))
 	{
@@ -148,7 +172,7 @@ function project_prepare_head($object)
 	$head[$h][2] = 'agenda';
 	$h++;
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'project', 'remove');
+	complete_head_from_modules($conf, $langs, $project, $head, $h, 'project', 'remove');
 
 	return $head;
 }
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index 6f206832e2d..60b01b567f4 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -290,6 +290,8 @@ if (!function_exists('dol_loginfunction'))
 		// Include login page template
 		include $template_dir.'login.tpl.php';
 
+		// Global html output events ($mesgs, $errors, $warnings)
+		dol_htmloutput_events(0);
 
 		$_SESSION["dol_loginmesg"] = '';
 	}
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index d56d2260afc..3b261bd0814 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -170,7 +170,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 0"; // Limit to products
     	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
     } else {
     	// Count on payments date
@@ -208,7 +208,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 0"; // Limit to products
     	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
@@ -312,7 +312,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 1"; // Limit to services
     	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture;
     } else {
     	// Count on payments date
@@ -350,7 +350,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 1"; // Limit to services
     	$sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
@@ -451,7 +451,7 @@ function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $di
     	if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = -1";
     	$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
     	$sql .= " ORDER BY e.rowid";
 
     	if (!$sql)
@@ -622,7 +622,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
         $sql .= " AND (d.product_type = 0"; // Limit to products
         $sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
     } else {
     	// Count on payments date
@@ -660,7 +660,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
     	if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
     	$sql .= " AND (d.product_type = 0"; // Limit to products
     	$sql .= " AND d.date_start is null AND d.date_end IS NULL)"; // enhance detection of products
-    	if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+    	if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
     	$sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
@@ -764,7 +764,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql .= " AND f.datef >= '".$db->idate($date_start)."' AND f.datef <= '".$db->idate($date_end)."'";
         $sql .= " AND (d.product_type = 1"; // Limit to services
         $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture;
     } else {
         // Count on payments date
@@ -802,7 +802,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
         if ($date_start && $date_end) $sql .= " AND pa.datep >= '".$db->idate($date_start)."' AND pa.datep <= '".$db->idate($date_end)."'";
         $sql .= " AND (d.product_type = 1"; // Limit to services
         $sql .= " OR d.date_start is NOT null OR d.date_end IS NOT NULL)"; // enhance detection of service
-        if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
+        if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.".$total_tva." <> 0)";
         $sql .= " ORDER BY d.rowid, d.".$fk_facture.", pf.rowid";
     }
 
@@ -903,7 +903,7 @@ function tax_by_rate($type, $db, $y, $q, $date_start, $date_end, $modetax, $dire
 		if ($date_start && $date_end) $sql .= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
 		$sql .= " AND (d.product_type = -1";
 		$sql .= " OR e.date_debut is NOT null OR e.date_fin IS NOT NULL)"; // enhance detection of service
-		if (empty($conf->global->MAIN_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
+		if (!empty($conf->global->MAIN_NOT_INCLUDE_ZERO_VAT_IN_REPORTS)) $sql .= " AND (d.".$f_rate." <> 0 OR d.total_tva <> 0)";
 		$sql .= " ORDER BY e.rowid";
 
 		if (!$sql)
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 7d67635a1e2..722c0f41263 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -421,6 +421,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	$colorbackhmenu1 = '';
 	$colorbackvmenu1 = '';
 	$colortexttitlenotab = '';
+	$colortexttitlelink = '';
 	$colorbacktitle1 = '';
 	$colortexttitle = '';
 	$colorbacklineimpair1 = '';
@@ -526,7 +527,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		//var_dump($conf->global->THEME_ELDY_BACKBODY);
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), ''), 'THEME_ELDY_BACKBODY', 'formcolor', 1, '', '', 'colorbackbody').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKBODY, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -569,7 +570,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), ''), 'THEME_ELDY_TOPMENU_BACK1', 'formcolor', 1, '', '', 'colorbackhmenu1').' ';
 		} else {
 	   		$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -612,7 +613,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), ''), 'THEME_ELDY_VERMENU_BACK1', 'formcolor', 1, '', '', 'colorbackvmenu1').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_VERMENU_BACK1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -635,7 +636,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLENOTAB, array()), ''), 'THEME_ELDY_TEXTTITLENOTAB', 'formcolor', 1, '', '', 'colortexttitlenotab').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLENOTAB, $langs->trans("Default"));
 		}
@@ -657,7 +658,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1, array()), ''), 'THEME_ELDY_BACKTITLE1', 'formcolor', 1, '', '', 'colorbacktitle1').' ';
 		} else {
 	   		print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
 	   	}
@@ -679,7 +680,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLE, array()), ''), 'THEME_ELDY_TEXTTITLE', 'formcolor', 1, '', '', 'colortexttitle').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLE, $langs->trans("Default"));
 		}
@@ -701,7 +702,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTTITLELINK, array()), ''), 'THEME_ELDY_TEXTTITLELINK', 'formcolor', 1, '', '', 'colortexttitlelink').' ';
 		} else {
 			print $formother->showColor($conf->global->THEME_ELDY_TEXTTITLELINK, $langs->trans("Default"));
 		}
@@ -724,7 +725,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), ''), 'THEME_ELDY_LINEIMPAIR1', 'formcolor', 1, '', '', 'colorbacklinepair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -747,7 +748,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), ''), 'THEME_ELDY_LINEPAIR1', 'formcolor', 1, '', '', 'colorbacklineimpair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -790,7 +791,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit)
 		{
-			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1).' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), ''), 'THEME_ELDY_TEXTLINK', 'formcolor', 1, '', '', 'colortextlink').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTLINK, array()), '');
 			if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
@@ -831,7 +832,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
-			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1).' ';
+			print $formother->selectColor($color, 'THEME_ELDY_USE_HOVER', 'formcolor', 1, '', '', 'colorbacklinepairhover').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_HOVER == '1') $color = colorArrayToHex(colorStringToArray($colorbacklinepairhover));
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_HOVER, array()), '');
@@ -871,7 +872,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		{
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
-			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1).' ';
+			print $formother->selectColor($color, 'THEME_ELDY_USE_CHECKED', 'formcolor', 1, '', '', 'colorbacklinepairchecked').' ';
 		} else {
 			if ($conf->global->THEME_ELDY_USE_CHECKED == '1') $color = 'e6edf0';
 			else $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_USE_CHECKED, array()), '');
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 25ef112b39b..818198fc035 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -289,10 +289,12 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6', 'ExpenseReportJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 2, __ENTITY__);
 	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2709__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2', 'PurchasesJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 3, __ENTITY__);
 	--insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1', 'SellsJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 4, __ENTITY__);
-	-- General Ledger
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
 	-- Balance
-	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2435__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 10, __ENTITY__);
+	-- General Ledger
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __ENTITY__);
+    -- Journals
+	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2434__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Journals', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
 	-- Export accounting documents
 	insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 17, __ENTITY__);
 	-- Reports
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 8bde6d6fa61..a124759faa8 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -551,7 +551,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
 					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vsmenu">';
+					else print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
 					print $menu_array[$i]['titre'];
 					if ($shorturlwithoutparam) print '</a>';
 					else print '</span>';
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 3f99754b5cd..33380c531f1 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -332,9 +332,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Accounting
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled)),
-		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),
-		'module'=>'comptabilite|accounting|asset'
+		'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled) || !empty($conf->intracommreport->enabled)),
+		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read) || !empty($user->rights->intracommreport->read)),
+		'module'=>'comptabilite|accounting|asset|intracommreport'
 	);
 	$menu_arr[] = array(
 		'name' => 'Accounting',
@@ -353,7 +353,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 		'session' => (($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),
 
-		'loadLangs' => array("compta", "accountancy", "assets"),
+		'loadLangs' => array("compta", "accountancy", "assets","intracommreport"),
 		'submenus' => array(),
 	);
 
@@ -1048,7 +1048,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');
 				}
 
-				$newmenu->add("/fourn/facture/paiement.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
+				$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
 
 				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');
 
@@ -1315,13 +1315,21 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				// Accounting
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire, '', $mainmenu, 'accountancy', 1);
 
-
-				// General Ledger
-				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
-
 				// Balance
 				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
 
+				// General Ledger
+				$newmenu->add("/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);
+
+				// Journals
+				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->rights->accounting->mouvements->lire);
+
+				// Files
+				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
+				{
+					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
+				}
+
 				// Closure
 				if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
 					$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
@@ -1331,12 +1339,6 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					}
 				}
 
-				// Files
-				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU))
-				{
-					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
-				}
-
 				// Reports
 				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
 
@@ -1430,13 +1432,24 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report", $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
 					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-					// Journaux
+					// Journals
 					$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
 					$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
 				}
-				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
 			}
 
+            // Intracomm report
+            if (! empty($conf->intracommreport->enabled))
+            {
+                $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+                if ($usemenuhider || empty($leftmenu) || preg_match('/intracommreport/', $leftmenu)) {
+                    // DEB / DES
+                    $newmenu->add("/intracommreport/card.php?action=create&leftmenu=intracommreport", $langs->trans("MenuIntracommReportNew"), 1, $user->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
+                    $newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+                }
+            }
+
 			// Assets
 			if (!empty($conf->asset->enabled))
 			{
@@ -2063,7 +2076,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 				{
 					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
 					if ($shorturlwithoutparam) print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
-					else print '<span class="vsmenu">';
+					else print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
 					print $menu_array[$i]['titre'];
 					if ($shorturlwithoutparam) print '</a>';
 					else print '</span>';
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 64145334883..d0f2ae5b7be 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -402,8 +402,8 @@ class MenuManager
 						if ($this->menu->liste[$i]['enabled'])
 						{
 							print $tabstring;
-							if ($this->menu->liste[$i]['url']) print '<a class="vsmenu" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
-							else print '<span class="vsmenu">';
+							if ($this->menu->liste[$i]['url']) print '<a class="vsmenu"  itle="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'" href="'.dol_buildpath($this->menu->liste[$i]['url'], 1).'"'.($this->menu->liste[$i]['target'] ? ' target="'.$this->menu->liste[$i]['target'].'"' : '').'>';
+							else print '<span class="vsmenu" title="'.dol_escape_htmltag($this->menu->liste[$i]['titre']).'">';
 							if ($this->menu->liste[$i]['url']) print $this->menu->liste[$i]['titre'].'</a>';
 							else print '</span>';
 						} else {
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 603fd4efa22..5bc041fd7b5 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -224,9 +224,16 @@ class pdf_einstein extends ModelePDFCommandes
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			global $outputlangsbis;
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
+		}
+
 		$nblines = count($object->lines);
 
-		if ($conf->commande->dir_output)
+		if ($conf->commande->multidir_output[$conf->entity])
 		{
             $object->fetch_thirdparty();
 
@@ -325,7 +332,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
@@ -335,6 +342,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
+				$height_incoterms = 0;
 				if ($conf->incoterm->enabled)
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
@@ -585,15 +593,17 @@ class pdf_einstein extends ModelePDFCommandes
 				}
 
 				// Show square
-				if ($pagenb == 1)
+				if ($pagenb == 1) {
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				}
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
-				// Affiche zone infos
+				// Display infos area
 				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
-				// Affiche zone totaux
+				// Display total zone
 				$posy = $this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
@@ -664,7 +674,7 @@ class pdf_einstein extends ModelePDFCommandes
 	 *   @param		Object		$object			Object to show
 	 *   @param		int			$posy			Y
 	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
+	 *   @return	int
 	 */
 	protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -783,20 +793,22 @@ class pdf_einstein extends ModelePDFCommandes
         	// Si mode reglement non force ou si force a CHQ
 	        if (!empty($conf->global->FACTURE_CHQ_NUMBER))
 	        {
-	            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+	        	$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+
+	        	if ($conf->global->FACTURE_CHQ_NUMBER > 0)
 	            {
 	                $account = new Account($this->db);
 	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
 	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - 3);
+	                $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 		            $posy = $pdf->GetY() + 1;
 
 		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 		            {
 		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - 3);
+		                $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 			            $posy = $pdf->GetY() + 2;
 		            }
@@ -804,14 +816,14 @@ class pdf_einstein extends ModelePDFCommandes
 	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
 	            {
 	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - 3);
+	                $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 		            $posy = $pdf->GetY() + 1;
 
 		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 		            {
 			            $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - 3);
+			            $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
 			            $posy = $pdf->GetY() + 2;
 		            }
@@ -822,10 +834,10 @@ class pdf_einstein extends ModelePDFCommandes
         // If payment mode not forced or forced to VIR, show payment with BAN
         if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
         {
-			if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
+			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
 			{
-				$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-				if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+				if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 				$account = new Account($this->db);
 				$account->fetch($bankid);
 
@@ -856,15 +868,23 @@ class pdf_einstein extends ModelePDFCommandes
 	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
         // phpcs:enable
-	    global $conf, $mysoc;
+		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
+		$outputlangsbis = null;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+			$default_font_size--;
+		}
+
 		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		// Tableau total
+		// Total table
         $col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
@@ -878,7 +898,7 @@ class pdf_einstein extends ModelePDFCommandes
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
 
 		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
 		$pdf->SetXY($col2x, $tab2_top + 0);
@@ -918,7 +938,8 @@ class pdf_einstein extends ModelePDFCommandes
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT1", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
@@ -949,7 +970,8 @@ class pdf_einstein extends ModelePDFCommandes
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT2", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
@@ -975,7 +997,8 @@ class pdf_einstein extends ModelePDFCommandes
 							$tvakey = str_replace('*', '', $tvakey);
 							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 						}
-						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).' ';
+						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalVAT", $mysoc->country_code) : '');
+						$totalvat .= ' ';
 						$totalvat .= vatrate($tvakey, 1).$tvacompl;
 						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
@@ -1006,7 +1029,8 @@ class pdf_einstein extends ModelePDFCommandes
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT1", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT1", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1025,6 +1049,7 @@ class pdf_einstein extends ModelePDFCommandes
 
 					foreach ($localtax_rate as $tvakey => $tvaval)
 					{
+						// retrieve global local tax
 						if ($tvakey != 0)    // On affiche pas taux 0
 						{
 							//$this->atleastoneratenotnull++;
@@ -1038,7 +1063,8 @@ class pdf_einstein extends ModelePDFCommandes
 								$tvakey = str_replace('*', '', $tvakey);
 								$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 							}
-							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).' ';
+							$totalvat = $outputlangs->transcountrynoentities("TotalLT2", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalLT2", $mysoc->country_code) : '');
+							$totalvat .= ' ';
 
 							$totalvat .= vatrate(abs($tvakey), 1).$tvacompl;
 							$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
@@ -1055,7 +1081,7 @@ class pdf_einstein extends ModelePDFCommandes
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->SetTextColor(0, 0, 60);
 				$pdf->SetFillColor(224, 224, 224);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalTTC", $mysoc->country_code) : ''), $useborder, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
@@ -1078,7 +1104,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid"), 0, 'L', 0);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', 0);
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
 
@@ -1086,7 +1112,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->SetTextColor(0, 0, 60);
 			$pdf->SetFillColor(224, 224, 224);
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay"), $useborder, 'L', 1);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), $useborder, 'L', 1);
 
 			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
@@ -1111,9 +1137,10 @@ class pdf_einstein extends ModelePDFCommandes
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @param		string		$currency		Currency code
+	 *   @param		Translate	$outputlangsbis	Langs object bis
 	 *   @return	void
 	 */
-	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
 	{
 		global $conf;
 
@@ -1131,6 +1158,10 @@ class pdf_einstein extends ModelePDFCommandes
 		if (empty($hidetop))
 		{
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
+			}
+
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
@@ -1214,10 +1245,11 @@ class pdf_einstein extends ModelePDFCommandes
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	int                         Return topshift value
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "PdfOrderTitle")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null, $titlekey = "PdfOrderTitle")
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
@@ -1238,8 +1270,10 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
+		$w = 100;
+
 		$posy = $this->marge_haute;
-		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -1263,12 +1297,12 @@ class pdf_einstein extends ModelePDFCommandes
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
 		}
 
@@ -1276,7 +1310,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities($titlekey);
-		$pdf->MultiCell(100, 3, $title, '', 'R');
+		$pdf->MultiCell($w, 3, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
@@ -1293,7 +1327,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$posy += 5;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
@@ -1323,14 +1357,14 @@ class pdf_einstein extends ModelePDFCommandes
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client))
 		{
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Get contact
@@ -1344,7 +1378,7 @@ class pdf_einstein extends ModelePDFCommandes
                 $posy += 4;
                 $pdf->SetXY($posx, $posy);
 		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
 		    }
 		}
 
@@ -1353,7 +1387,7 @@ class pdf_einstein extends ModelePDFCommandes
 		$top_shift = 0;
 		// Show list of linked objects
 		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
 		if ($current_y < $pdf->getY())
 		{
 			$top_shift = $pdf->getY() - $current_y;
@@ -1402,8 +1436,7 @@ class pdf_einstein extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 
-
-			// If CUSTOMER contact defined on order, we use it
+			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 			if (count($arrayidcontact) > 0)
@@ -1425,9 +1458,10 @@ class pdf_einstein extends ModelePDFCommandes
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox = 100;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
-			$posy = 42 + $top_shift;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
@@ -1441,7 +1475,7 @@ class pdf_einstein extends ModelePDFCommandes
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index e6e54e521d8..01ee9b0ec98 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -120,6 +120,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 	*/
 	public $emetteur;
 
+	/**
+	 * @var array of document table collumns
+	 */
+	public $cols;
+
 
 	/**
 	 *	Constructor
@@ -165,11 +170,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1;
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
 
+		//  Use new system for position of columns, view  $this->defineColumnField()
+
 		$this->tva = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
@@ -242,7 +249,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 		        {
 		            if (!$arephoto)
 		            {
-		                $dir = $conf->product->dir_output.'/'.$midir;
+		            	if ($conf->product->entity != $objphoto->entity) {
+		            		$dir = $conf->product->multidir_output[$objphoto->entity].'/'.$midir; //Check repertories of current entities
+		            	} else {
+		            		$dir = $conf->product->dir_output.'/'.$midir; //Check repertory of the current product
+		            	}
 
 		                foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
 		                {
@@ -271,7 +282,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 
 
-		if ($conf->commande->dir_output)
+		if ($conf->commande->multidir_output[$conf->entity])
 		{
             $object->fetch_thirdparty();
 
@@ -345,12 +356,13 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-				/// Does we have at least one line with discount $this->atleastonediscount
-				foreach ($object->lines as $line) {
-				    if ($line->remise_percent) {
-				        $this->atleastonediscount = true;
-				        break;
-				    }
+				// Set $this->atleastonediscount if you have at least one discount
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
+					}
 				}
 
 
@@ -358,7 +370,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 				$pagenb++;
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
@@ -368,6 +380,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// Incoterm
+				$height_incoterms = 0;
 				if ($conf->incoterm->enabled)
 				{
 					$desc_incoterms = $object->getIncotermsForPDF();
@@ -404,15 +417,16 @@ class pdf_eratosthene extends ModelePDFCommandes
 
                 // Extrafields in note
                 $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote))
-                {
+                if (!empty($extranote)) {
                     $notetoshow = dol_concatdesc($notetoshow, $extranote);
                 }
 
 				$pagenb = $pdf->getPage();
 				if ($notetoshow)
 				{
-				    $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$tab_top -= 2;
+
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
 				    $pageposbeforenote = $pagenb;
 
 				    $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
@@ -420,8 +434,6 @@ class pdf_eratosthene extends ModelePDFCommandes
 				    $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
 				    $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-					$tab_top -= 2;
-
 				    $pdf->startTransaction();
 
 				    $pdf->SetFont('', '', $default_font_size - 1);
@@ -582,6 +594,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					    }
 					}
 
+					// Description of product line
 					if ($this->getColumnStatus('desc'))
 					{
     					$pdf->startTransaction();
@@ -632,7 +645,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					$pdf->setTopMargin($this->marge_haute);
 					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
-					// We suppose that a too long description is moved completely on next page
+					// We suppose that a too long description or photo were moved completely on next page
 					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
@@ -681,7 +694,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 					    $nexY = max($pdf->GetY(), $nexY);
 					}
 
-					// Total HT line
+					// Total excl tax line (HT)
 					if ($this->getColumnStatus('totalexcltax'))
 					{
 					    $total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
@@ -689,7 +702,15 @@ class pdf_eratosthene extends ModelePDFCommandes
 					    $nexY = max($pdf->GetY(), $nexY);
 					}
 
-                    // Extrafields
+					// Total with tax line (TTC)
+					if ($this->getColumnStatus('totalincltax'))
+					{
+						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Extrafields
                     if (!empty($object->lines[$i]->array_options)) {
                         foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
                             if ($this->getColumnStatus($extrafieldColKey))
@@ -795,14 +816,17 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 				// Show square
 				if ($pagenb == $pageposbeforeprintlines)
+				{
 				    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
-				else $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code);
+				}
 				$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 
-				// Affiche zone infos
+				// Display infos area
 				$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-				// Affiche zone totaux
+				// Display total zone
 				$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
 				// Affiche zone versements
@@ -986,20 +1010,22 @@ class pdf_eratosthene extends ModelePDFCommandes
             // Si mode reglement non force ou si force a CHQ
             if (!empty($conf->global->FACTURE_CHQ_NUMBER))
             {
-	            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+            	$diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 3 : $conf->global->PDF_DIFFSIZE_TITLE);
+
+            	if ($conf->global->FACTURE_CHQ_NUMBER > 0)
 	            {
 	                $account = new Account($this->db);
 	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
 
 	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - 3);
+	                $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
 		            $posy = $pdf->GetY() + 1;
 
 		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 		            {
 		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - 3);
+		                $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 			            $posy = $pdf->GetY() + 2;
 		            }
@@ -1007,14 +1033,14 @@ class pdf_eratosthene extends ModelePDFCommandes
 	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
 	            {
 	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('', 'B', $default_font_size - 3);
+	                $pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
 	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
 		            $posy = $pdf->GetY() + 1;
 
 		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
 		            {
 			            $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('', '', $default_font_size - 3);
+			            $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
 			            $posy = $pdf->GetY() + 2;
 		            }
@@ -1025,10 +1051,10 @@ class pdf_eratosthene extends ModelePDFCommandes
         // If payment mode not forced or forced to VIR, show payment with BAN
         if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
         {
-			if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
+			if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
 			{
-				$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-				if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+				if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 				$account = new Account($this->db);
 				$account->fetch($bankid);
 
@@ -1057,31 +1083,33 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 */
 	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-	    global $conf, $mysoc;
+		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$tab2_top = $posy;
-		$tab2_hl = 4;
-		$pdf->SetFont('', '', $default_font_size - 1);
-
-		// Tableau total
-        $col1x = 120; $col2x = 170;
-		if ($this->page_largeur < 210) // To work with US executive format
-		{
-			$col2x -= 20;
-		}
-		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
-		$useborder = 0;
-		$index = 0;
-
 		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
 			$outputlangsbis = new Translate('', $conf);
 			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
 			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+			$default_font_size--;
 		}
 
+		$tab2_top = $posy;
+		$tab2_hl = 4;
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		// Total table
+        $col1x = 120; $col2x = 170;
+		if ($this->page_largeur < 210) // To work with US executive format
+		{
+			$col2x -= 20;
+		}
+		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+
+		$useborder = 0;
+		$index = 0;
+
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
@@ -1234,6 +1262,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 					foreach ($localtax_rate as $tvakey => $tvaval)
 					{
+						// retrieve global local tax
 						if ($tvakey != 0)    // On affiche pas taux 0
 						{
 							//$this->atleastoneratenotnull++;
@@ -1321,9 +1350,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @param		string		$currency		Currency code
+	 *   @param		Translate	$outputlangsbis	Langs object bis
 	 *   @return	void
 	 */
-	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
 	{
 		global $conf;
 
@@ -1341,6 +1371,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 		if (empty($hidetop))
 		{
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
+			}
+
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
@@ -1373,10 +1407,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @param	string		$titlekey		Translation key to show as title of document
 	 *  @return	int                         Return topshift value
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "PdfOrderTitle")
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null, $titlekey = "PdfOrderTitle")
 	{
 		// phpcs:enable
 		global $conf, $langs, $hookmanager;
@@ -1397,8 +1432,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
+		$w = 100;
+
 		$posy = $this->marge_haute;
-		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -1422,12 +1459,12 @@ class pdf_eratosthene extends ModelePDFCommandes
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
 		}
 
@@ -1435,7 +1472,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities($titlekey);
-		$pdf->MultiCell(100, 3, $title, '', 'R');
+		$pdf->MultiCell($w, 4, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
@@ -1449,10 +1486,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		if ($object->ref_client)
 		{
-			$posy += 5;
+			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
@@ -1483,14 +1520,14 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client))
 		{
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Get contact
@@ -1504,7 +1541,7 @@ class pdf_eratosthene extends ModelePDFCommandes
                 $posy += 4;
                 $pdf->SetXY($posx, $posy);
 		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
 		    }
 		}
 
@@ -1513,7 +1550,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		$top_shift = 0;
 		// Show list of linked objects
 		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
 		if ($current_y < $pdf->getY())
 		{
 			$top_shift = $pdf->getY() - $current_y;
@@ -1562,8 +1599,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$pdf->MultiCell(80, 4, $carac_emetteur, 0, 'L');
 
 
-
-			// If CUSTOMER contact defined on order, we use it
+			// If CUSTOMER contact defined, we use it
 			$usecontact = false;
 			$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
 			if (count($arrayidcontact) > 0)
@@ -1585,9 +1621,10 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox = 100;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
-			$posy = 42 + $top_shift;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
@@ -1601,7 +1638,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
@@ -1690,7 +1727,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	            'align' => 'L',
 	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 	            // 'label' => ' ', // the final label
-                'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+                'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 	        ),
 	        'content' => array(
 	            'align' => 'L',
@@ -1698,6 +1735,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 	        ),
 	    );
 
+	    // Image of product
 	    $rank = $rank + 10;
 	    $this->cols['photo'] = array(
 	        'rank' => $rank,
@@ -1789,14 +1827,25 @@ class pdf_eratosthene extends ModelePDFCommandes
 	    $this->cols['totalexcltax'] = array(
 	        'rank' => $rank,
 	        'width' => 26, // in mm
-	        'status' => true,
+	    	'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
 	        'title' => array(
 	            'textkey' => 'TotalHT'
 	        ),
 	        'border-left' => true, // add left line separator
 	    );
 
-        // Add extrafields cols
+	    $rank = $rank + 1010; // add a big offset to be sure is the last col because default extrafield rank is 100
+	    $this->cols['totalincltax'] = array(
+	    	'rank' => $rank,
+	    	'width' => 26, // in mm
+	    	'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+	    	'title' => array(
+	    		'textkey' => 'TotalTTC'
+	    	),
+	    	'border-left' => true, // add left line separator
+	    );
+
+	    // Add extrafields cols
         if (!empty($object->lines)) {
             $line = reset($object->lines);
             $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index ae1310a924a..003e134faba 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -368,6 +368,7 @@ class pdf_standard extends ModeleExpenseReport
 					if ($pageposafter > $pageposbefore) {
 						// There is a pagebreak
 						$pdf->rollbackTransaction(true);
+
 						$pageposafter = $pageposbefore;
 						//print $pageposafter.'-'.$pageposbefore;exit;
 						if (empty($showpricebeforepagebreak)) {
@@ -570,6 +571,7 @@ class pdf_standard extends ModeleExpenseReport
 	{
 		global $conf;
 		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->SetTextColor(0, 0, 0);
 
 		// Accountancy piece
 		$pdf->SetXY($this->posxpiece, $curY);
diff --git a/htdocs/core/modules/export/export_excel2007new.modules.php b/htdocs/core/modules/export/export_excel2007new.modules.php
index 6d7cbb5d05f..4f7235f6843 100644
--- a/htdocs/core/modules/export/export_excel2007new.modules.php
+++ b/htdocs/core/modules/export/export_excel2007new.modules.php
@@ -27,6 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Writer\Xlsx;
+use PhpOffice\PhpSpreadsheet\Cell\Coordinate;
 
 /**
  *	Class to build export files with Excel format
@@ -59,6 +60,8 @@ class ExportExcel2007new extends ModeleExports
 
 	public $worksheet; // Handle sheet
 
+	public $styleArray;
+
 	public $row;
 
 	public $col;
@@ -436,4 +439,204 @@ class ExportExcel2007new extends ModeleExports
 
     	return $letter;
     }
+
+	/**
+	 * Set cell value and automatically merge if we give an endcell
+	 *
+	 * @param string $val cell value
+	 * @param string $startCell starting cell
+	 * @param string $endCell  ending cell
+	 * @return int 1 if success -1 if failed
+	 */
+	public function setCellValue($val, $startCell, $endCell = '')
+	{
+		try {
+			$this->workbook->getActiveSheet()->setCellValue($startCell, $val);
+
+			if (! empty($endCell)) {
+				$cellRange = $startCell.':'.$endCell;
+				$this->workbook->getActiveSheet()->mergeCells($startCell.':'.$endCell);
+			}
+			else $cellRange = $startCell;
+			if (! empty($this->styleArray)) $this->workbook->getActiveSheet()->getStyle($cellRange)->applyFromArray($this->styleArray);
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Set border style
+	 *
+	 * @param string $thickness style \PhpOffice\PhpSpreadsheet\Style\Border
+	 * @param string $color     color \PhpOffice\PhpSpreadsheet\Style\Color
+	 * @return int 1 if ok
+	 */
+	public function setBorderStyle($thickness, $color)
+	{
+		$this->styleArray['borders'] = array(
+			'outline' => array(
+				'borderStyle' => $thickness,
+				'color' => array('argb' => $color)
+			)
+		);
+		return 1;
+	}
+
+	/**
+	 * Set font style
+	 *
+	 * @param bool   $bold  true if bold
+	 * @param string $color color \PhpOffice\PhpSpreadsheet\Style\Color
+	 * @return int 1
+	 */
+	public function setFontStyle($bold, $color)
+	{
+		$this->styleArray['font'] = array(
+			'color' => array('argb' => $color),
+			'bold' => $bold
+		);
+		return 1;
+	}
+
+	/**
+	 * Set alignment style (horizontal, left, right, ...)
+	 *
+	 * @param string $horizontal PhpOffice\PhpSpreadsheet\Style\Alignment
+	 * @return int 1
+	 */
+	public function setAlignmentStyle($horizontal)
+	{
+		$this->styleArray['alignment'] = array('horizontal' => $horizontal);
+		return 1;
+	}
+
+	/**
+	 * Reset Style
+	 * @return int 1
+	 */
+	public function resetStyle()
+	{
+		$this->styleArray = array();
+		return 1;
+	}
+
+	/**
+	 * Make a NxN Block in sheet
+	 *
+	 * @param string $startCell starting cell
+	 * @param array  $TDatas array(ColumnName=>array(Row value 1, row value 2, etc ...))
+	 * @param bool   $boldTitle true if bold headers
+	 * @return int 1 if OK, -1 if KO
+	 */
+	public function setBlock($startCell, $TDatas = array(), $boldTitle = false)
+	{
+		try {
+			if (! empty($TDatas)) {
+				$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+				$startRow = $startCell->getRow();
+				foreach ($TDatas as $column => $TRows) {
+					if ($boldTitle) $this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+					$this->setCellValue($column, $cell->getCoordinate());
+					$rowPos = $startRow;
+					if ($boldTitle) $this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					foreach ($TRows as $row) {
+						$rowPos++;
+						$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $rowPos);
+						$this->setCellValue($row, $cell->getCoordinate());
+					}
+					$startColumn++;
+				}
+			}
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Make a 2xN Tab in Sheet
+	 *
+	 * @param string $startCell A1
+	 * @param array  $TDatas    array(Title=>val)
+	 * @param bool   $boldTitle true if bold titles
+	 * @return int 1 if OK, -1 if KO
+	 */
+	public function setBlock2Columns($startCell, $TDatas = array(), $boldTitle = false)
+	{
+		try {
+			if (! empty($TDatas)) {
+				$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+				$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+				$startRow = $startCell->getRow();
+				foreach ($TDatas as $title => $val) {
+					$cell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+					if ($boldTitle) $this->setFontStyle(true, $this->styleArray['font']['color']['argb']);
+					$this->setCellValue($title, $cell->getCoordinate());
+					if ($boldTitle) $this->setFontStyle(false, $this->styleArray['font']['color']['argb']);
+					$cell2 = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn + 1, $startRow);
+					$this->setCellValue($val, $cell2->getCoordinate());
+					$startRow++;
+				}
+			}
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return 1;
+	}
+
+	/**
+	 * Enable auto sizing for column range
+	 *
+	 * @param string $firstColumn first column to autosize
+	 * @param string $lastColumn  to last column to autosize
+	 * @return int 1
+	 */
+	public function enableAutosize($firstColumn, $lastColumn)
+	{
+		foreach (range($firstColumn, $lastColumn) as $columnID) {
+			$this->workbook->getActiveSheet()->getColumnDimension($columnID)->setAutoSize(true);
+		}
+		return 1;
+	}
+
+	/**
+	 * Set a value cell and merging it by giving a starting cell and a length
+	 *
+	 * @param string $val       Cell value
+	 * @param string $startCell Starting cell
+	 * @param int    $length    Length
+	 * @param int    $offset    Starting offset
+	 * @return string Coordinate or -1 if KO
+	 */
+	public function setMergeCellValueByLength($val, $startCell, $length, $offset = 0)
+	{
+		try {
+			$startCell = $this->workbook->getActiveSheet()->getCell($startCell);
+			$startColumn = Coordinate::columnIndexFromString($startCell->getColumn());
+			if (! empty($offset)) $startColumn += $offset;
+
+			$startRow = $startCell->getRow();
+			$startCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn, $startRow);
+			$startCoordinate = $startCell->getCoordinate();
+			$this->setCellValue($val, $startCell->getCoordinate());
+
+			$endCell = $this->workbook->getActiveSheet()->getCellByColumnAndRow($startColumn + ($length - 1), $startRow);
+			$endCoordinate = $endCell->getCoordinate();
+			$this->workbook->getActiveSheet()->mergeCells($startCoordinate.':'.$endCoordinate);
+		}
+		catch (Exception $e) {
+			$this->error = $e->getMessage();
+			return -1;
+		}
+		return $endCoordinate;
+	}
 }
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index bab3bbd9e71..7e730fabbc5 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -289,7 +289,7 @@ class pdf_sponge extends ModelePDFFactures
 
 		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 
-		if ($conf->facture->dir_output)
+		if ($conf->facture->multidir_output[$conf->entity])
 		{
 			$object->fetch_thirdparty();
 
@@ -300,11 +300,11 @@ class pdf_sponge extends ModelePDFFactures
 			// Definition of $dir and $file
 			if ($object->specimen)
 			{
-				$dir = $conf->facture->dir_output;
+				$dir = $conf->facture->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->facture->dir_output."/".$objectref;
+				$dir = $conf->facture->multidir_output[$conf->entity]."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
 			if (!file_exists($dir))
@@ -386,11 +386,12 @@ class pdf_sponge extends ModelePDFFactures
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-				// Does we have at least one line with discount $this->atleastonediscount
-				foreach ($object->lines as $line) {
-					if ($line->remise_percent) {
-						$this->atleastonediscount = true;
-						break;
+				// Set $this->atleastonediscount if you have at least one discount
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
 					}
 				}
 
@@ -458,8 +459,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Extrafields in note
 				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-				if (!empty($extranote))
-				{
+				if (!empty($extranote)) {
 					$notetoshow = dol_concatdesc($notetoshow, $extranote);
 				}
 
@@ -735,7 +735,7 @@ class pdf_sponge extends ModelePDFFactures
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-					// Total HT line
+					// Total excl tax line (HT)
 					if ($this->getColumnStatus('totalexcltax'))
 					{
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
@@ -743,6 +743,14 @@ class pdf_sponge extends ModelePDFFactures
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
+					// Total with tax line (TTC)
+					if ($this->getColumnStatus('totalincltax'))
+					{
+						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
@@ -2216,7 +2224,7 @@ class pdf_sponge extends ModelePDFFactures
 			),
 		);
 
-		// PHOTO
+		// Image of product
 		$rank = $rank + 10;
 		$this->cols['photo'] = array(
 			'rank' => $rank,
@@ -2324,13 +2332,24 @@ class pdf_sponge extends ModelePDFFactures
 		$this->cols['totalexcltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => true,
+			'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
 			'title' => array(
 				'textkey' => 'TotalHT'
 			),
 			'border-left' => true, // add left line separator
 		);
 
+		$rank = $rank + 1010; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalincltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+			'title' => array(
+				'textkey' => 'TotalTTC'
+			),
+			'border-left' => true, // add left line separator
+		);
+
 		// Add extrafields cols
 		if (!empty($object->lines)) {
 			$line = reset($object->lines);
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index 7b9eeb02c0d..95f180b80ff 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -238,37 +238,35 @@ class mailing_fraise extends MailingTargets
         $cibles = array();
         $now = dol_now();
 
-        $dateendsubscriptionafter = dol_mktime($_POST['subscriptionafterhour'], $_POST['subscriptionaftermin'], $_POST['subscriptionaftersec'], $_POST['subscriptionaftermonth'], $_POST['subscriptionafterday'], $_POST['subscriptionafteryear']);
-        $dateendsubscriptionbefore = dol_mktime($_POST['subscriptionbeforehour'], $_POST['subscriptionbeforemin'], $_POST['subscriptionbeforesec'], $_POST['subscriptionbeforemonth'], $_POST['subscriptionbeforeday'], $_POST['subscriptionbeforeyear']);
+        $dateendsubscriptionafter = dol_mktime(GETPOST('subscriptionafterhour', 'int'), GETPOST('subscriptionaftermin', 'int'), GETPOST('subscriptionaftersec', 'int'), GETPOST('subscriptionaftermonth', 'int'), GETPOST('subscriptionafterday', 'int'), GETPOST('subscriptionafteryear', 'int'));
+        $dateendsubscriptionbefore = dol_mktime(GETPOST('subscriptionbeforehour', 'int'), GETPOST('subscriptionbeforemin', 'int'), GETPOST('subscriptionbeforesec', 'int'), GETPOST('subscriptionbeforemonth', 'int'), GETPOST('subscriptionbeforeday', 'int'), GETPOST('subscriptionbeforeyear', 'int'));
 
         // La requete doit retourner: id, email, fk_contact, name, firstname
         $sql = "SELECT a.rowid as id, a.email as email, null as fk_contact, ";
         $sql .= " a.lastname, a.firstname,";
         $sql .= " a.datefin, a.civility as civility_id, a.login, a.societe"; // Other fields
         $sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
-        if ($_POST['filter_category'])
+        if (GETPOST('filter_category'))
         {
-        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
-        	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie";
+        	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = a.rowid";
+        	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie AND c.rowid = ".((int) GETPOST('filter_category', 'int'));
         }
         $sql .= " , ".MAIN_DB_PREFIX."adherent_type as ta";
         $sql .= " WHERE a.entity IN (".getEntity('member').") AND a.email <> ''"; // Note that null != '' is false
         $sql .= " AND a.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".$this->db->escape($mailing_id).")";
         // Filter on status
-        if (isset($_POST["filter"]) && $_POST["filter"] == '-1') {
+        if (GETPOST("filter") == '-1') {
             $sql .= " AND a.statut=-1";
         }
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
-        if (isset($_POST["filter"]) && $_POST["filter"] == '0')  $sql .= " AND a.statut=0";
+        if (GETPOST("filter", 'aZ09') == '1a') $sql .= " AND a.statut=1 AND (a.datefin >= '".$this->db->idate($now)."' OR ta.subscription = 0)";
+        if (GETPOST("filter", 'aZ09') == '1b') $sql .= " AND a.statut=1 AND ((a.datefin IS NULL or a.datefin < '".$this->db->idate($now)."') AND ta.subscription = 1)";
+        if (GETPOST("filter", 'aZ09') === '0')  $sql .= " AND a.statut=0";
         // Filter on date
         if ($dateendsubscriptionafter > 0)  $sql .= " AND datefin > '".$this->db->idate($dateendsubscriptionafter)."'";
         if ($dateendsubscriptionbefore > 0) $sql .= " AND datefin < '".$this->db->idate($dateendsubscriptionbefore)."'";
         $sql .= " AND a.fk_adherent_type = ta.rowid";
         // Filter on type
-        if (GETPOSTISET('filter_type')) $sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type'))."'";
-        // Filter on category
-        if (GETPOSTISSET('filter_category')) $sql .= " AND c.rowid='".$this->db->escape(GETPOST('filter_category'))."'";
+        if (GETPOST('filter_type', 'int') > 0) $sql .= " AND ta.rowid='".$this->db->escape(GETPOST('filter_type', 'int'))."'";
         $sql .= " ORDER BY a.email";
         //print $sql;
 
@@ -302,7 +300,7 @@ class mailing_fraise extends MailingTargets
                                 'source_url' => $this->url($obj->id),
                                 'source_id' => $obj->id,
                                 'source_type' => 'member'
-                                );
+                    );
                     $old = $obj->email;
                     $j++;
                 }
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index 95d8e35489f..0da6ac160b8 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -265,16 +265,16 @@ class modCommande extends DolibarrModules
 		if (empty($user->rights->societe->client->voir)) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.(empty($user) ? 0 : $user->id);
 		// Imports
 		//--------
-		$r=0;
+		$r = 0;
 		//Import Order Header
 
 		$r++;
-		$this->import_code[$r] = 'commande_' . $r;
+		$this->import_code[$r] = 'commande_'.$r;
 		$this->import_label[$r] = 'Sales Orders';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = [];
-		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX . 'commande', 'extra' => MAIN_DB_PREFIX . 'commande_extrafields'];
-		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author'];	// Fields to store import user id
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'commande', 'extra' => MAIN_DB_PREFIX.'commande_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author']; // Fields to store import user id
 		$this->import_fields_array[$r] = [
 			'c.ref'               => 'Document Ref*',
 			'c.ref_client'        => 'RefCustomer',
@@ -299,7 +299,7 @@ class modCommande extends DolibarrModules
 			'c.model_pdf'         => 'Model'
 		];
 
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
 			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
 			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
@@ -309,23 +309,23 @@ class modCommande extends DolibarrModules
 
 		// Add extra fields
 		$import_extrafield_sample = [];
-		$sql = "SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'commande' AND entity IN (0, " . $conf->entity . ")";
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commande' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 				$import_extrafield_sample[$fieldname] = $fieldlabel;
 			}
 		}
 		// End add extra fields
 
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'commande'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande'];
 		$this->import_regex_array[$r] = [
 			'c.ref' => '(CPV\d{4}-\d{4}|CO\d{4}-\d{4}|PROV.{1,32}$)',
-			'c.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'
+			'c.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
 		];
 
 		$this->import_updatekeys_array[$r] = ['c.ref' => 'Ref'];
@@ -359,7 +359,7 @@ class modCommande extends DolibarrModules
 		$this->import_label[$r] = 'Order Details';
 		$this->import_icon[$r] = $this->picto;
 		$this->import_entities_array[$r] = [];
-		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX . 'commandedet', 'extra' => MAIN_DB_PREFIX . 'commandedet_extrafields'];
+		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX.'commandedet', 'extra' => MAIN_DB_PREFIX.'commandedet_extrafields'];
 		$this->import_fields_array[$r] = [
 			'cd.fk_commande'    => 'Document Ref*',
 			'cd.fk_parent_line' => 'PrParentLine',
@@ -382,7 +382,7 @@ class modCommande extends DolibarrModules
 			'cd.rang'           => 'LinePosition'
 		];
 
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -391,22 +391,22 @@ class modCommande extends DolibarrModules
 		}
 
 		// Add extra fields
-		$sql="SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'commandedet' AND entity IN (0, " . $conf->entity . ")";
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'commandedet' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 			}
 		}
 		// End add extra fields
 
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'commandedet'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commandedet'];
 		$this->import_regex_array[$r] = [
 			'cd.product_type'       => '[0|1]$',
-			'cd.fk_product'         => 'rowid@' . MAIN_DB_PREFIX . 'product',
-			'cd.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'
+			'cd.fk_product'         => 'rowid@'.MAIN_DB_PREFIX.'product',
+			'cd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
 		];
 		$this->import_updatekeys_array[$r] = ['cd.fk_commande' => 'Sales Order Id', 'cd.fk_product' => 'Product Id'];
 		$this->import_convertvalue_array[$r] = [
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 7d055082121..71b66925922 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -63,12 +63,12 @@ class modFournisseur extends DolibarrModules
 
 		// Data directories to create when module is enabled
 		$this->dirs = array(
-            "/fournisseur/temp",
-            "/fournisseur/commande",
-            "/fournisseur/commande/temp",
-            "/fournisseur/facture",
-            "/fournisseur/facture/temp"
-        );
+			"/fournisseur/temp",
+			"/fournisseur/commande",
+			"/fournisseur/commande/temp",
+			"/fournisseur/facture",
+			"/fournisseur/facture/temp"
+		);
 
 		// Dependencies
 		$this->depends = array("modSociete");
@@ -299,7 +299,7 @@ class modFournisseur extends DolibarrModules
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'p.accountancy_code_buy'=>'ProductAccountancyBuyCode', 'project.rowid'=>'ProjectId',
 			'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -434,7 +434,7 @@ class modFournisseur extends DolibarrModules
 			'f.fk_statut'=>'InvoiceStatus', 'f.note_public'=>"InvoiceNote", 'p.rowid'=>'PaymentId', 'pf.amount'=>'AmountPayment',
 			'p.datep'=>'DatePayment', 'p.num_paiement'=>'PaymentNumber', 'p.fk_bank'=>'IdTransaction', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -528,7 +528,7 @@ class modFournisseur extends DolibarrModules
 			'fd.total_tva'=>"LineTotalVAT", 'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'RefSupplier', 'fd.fk_product'=>'ProductId',
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
-		if (! empty($conf->multicurrency->enabled))
+		if (!empty($conf->multicurrency->enabled))
 		{
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -654,15 +654,15 @@ class modFournisseur extends DolibarrModules
 
 		//Import Supplier Invoice
 		//--------
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->import_code[$r] = $this->rights_class . '_' . $r;
-		$this->import_label[$r] = "Supplier Invoice";	// Translation key
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Supplier Invoice"; // Translation key
 		$this->import_icon[$r] = $this->picto;
-		$this->import_entities_array[$r] = [];		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = ['f' => MAIN_DB_PREFIX . 'facture_fourn', 'extra' => MAIN_DB_PREFIX . 'facture_fourn_extrafields'];
-		$this->import_tables_creator_array[$r] = ['f' => 'fk_user_author'];	// Fields to store import user id
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['f' => MAIN_DB_PREFIX.'facture_fourn', 'extra' => MAIN_DB_PREFIX.'facture_fourn_extrafields'];
+		$this->import_tables_creator_array[$r] = ['f' => 'fk_user_author']; // Fields to store import user id
 		$this->import_fields_array[$r] = [
 			'f.ref' => 'InvoiceRef*',
 			'f.ref_supplier' => 'RefSupplier',
@@ -697,19 +697,19 @@ class modFournisseur extends DolibarrModules
 		}
 		// Add extra fields
 		$import_extrafield_sample = [];
-		$sql = "SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, " . $conf->entity . ")";
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 				$import_extrafield_sample[$fieldname] = $fieldlabel;
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'facture_fourn'];
-		$this->import_regex_array[$r] = ['f.ref' => '(SI\d{4}-\d{4}|PROV.{1,32}$)', 'f.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn'];
+		$this->import_regex_array[$r] = ['f.ref' => '(SI\d{4}-\d{4}|PROV.{1,32}$)', 'f.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'];
 		$import_sample = [
 			'f.ref' => '(PROV001)',
 			'f.ref_supplier' => 'Supplier1',
@@ -751,10 +751,10 @@ class modFournisseur extends DolibarrModules
 		//Import Supplier Invoice Lines
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
-		$this->import_label[$r] = "Supplier Invoice Lines";	// Translation key
+		$this->import_label[$r] = "Supplier Invoice Lines"; // Translation key
 		$this->import_icon[$r] = $this->picto;
-		$this->import_entities_array[$r] = [];		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = ['fd' => MAIN_DB_PREFIX . 'facture_fourn_det', 'extra' => MAIN_DB_PREFIX . 'facture_fourn_det_extrafields'];
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['fd' => MAIN_DB_PREFIX.'facture_fourn_det', 'extra' => MAIN_DB_PREFIX.'facture_fourn_det_extrafields'];
 		$this->import_fields_array[$r] = [
 			'fd.fk_facture_fourn' => 'InvoiceRef*',
 			'fd.fk_parent_line' => 'FacParentLine',
@@ -784,19 +784,19 @@ class modFournisseur extends DolibarrModules
 		}
 		// Add extra fields
 		$import_extrafield_sample = [];
-		$sql = "SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'facture_fourn_det' AND entity IN (0, " . $conf->entity . ")";
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_fourn_det' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 				$import_extrafield_sample[$fieldname] = $fieldlabel;
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'facture_fourn_det'];
-		$this->import_regex_array[$r] = ['fd.product_type' => '[0|1]$', 'fd.fk_product' => 'rowid@' . MAIN_DB_PREFIX . 'product', 'fd.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture_fourn_det'];
+		$this->import_regex_array[$r] = ['fd.product_type' => '[0|1]$', 'fd.fk_product' => 'rowid@'.MAIN_DB_PREFIX.'product', 'fd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'];
 		$import_sample = [
 			'fd.fk_facture_fourn' => '(PROV001)',
 			'fd.fk_parent_line' => '',
@@ -827,6 +827,158 @@ class modFournisseur extends DolibarrModules
 		$this->import_convertvalue_array[$r] = [
 			'fd.fk_facture_fourn' => ['rule' => 'fetchidfromref', 'file' => '/fourn/class/fournisseur.facture.class.php', 'class' => 'FactureFournisseur', 'method' => 'fetch'],
 		];
+
+		//Import Purchase Orders
+		$r++;
+		$this->import_code[$r] = 'commande_fournisseur_' . $r;
+		$this->import_label[$r] = 'Purchase Orders';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX . 'commande_fournisseur', 'extra' => MAIN_DB_PREFIX . 'commande_fournisseur_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c' => 'fk_user_author'];	// Fields to store import user id
+		$this->import_fields_array[$r] = [
+			'c.ref'               => 'Document Ref*',
+			'c.ref_supplier'      => 'RefSupplier',
+			'c.fk_soc'            => 'ThirdPartyName*',
+			'c.fk_projet'         => 'ProjectId',
+			'c.date_creation'     => 'DateCreation',
+			'c.date_valid'        => 'DateValid',
+			'c.date_approve'      => 'DateApprove',
+			'c.date_commande'     => 'DateOrder',
+			'c.fk_user_modif'     => 'ModifiedById',
+			'c.fk_user_valid'     => 'ValidatedById',
+			'c.fk_user_approve'   => 'ApprovedById',
+			'c.source'            => 'Source',
+			'c.fk_statut'         => 'Status*',
+			'c.billed'            => 'Billed(0/1)',
+			'c.remise_percent'    => 'GlobalDiscount',
+			'c.tva'               => 'TotalTVA',
+			'c.total_ht'          => 'TotalHT',
+			'c.total_ttc'         => 'TotalTTC',
+			'c.note_private'      => 'NotePrivate',
+			'c.note_public'       => 'Note',
+			'c.date_livraison'    => 'DeliveryDate',
+			'c.fk_cond_reglement' => 'Payment Condition',
+			'c.fk_mode_reglement' => 'Payment Mode',
+			'c.model_pdf'         => 'Model'
+		];
+
+		if (! empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['c.multicurrency_code']      = 'Currency';
+			$this->import_fields_array[$r]['c.multicurrency_tx']        = 'CurrencyRate';
+			$this->import_fields_array[$r]['c.multicurrency_total_ht']  = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$import_extrafield_sample = [];
+		$sql = "SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'commande_fournisseur' AND entity IN (0, " . $conf->entity . ")";
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.' . $obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'commande_fournisseur'];
+		$this->import_regex_array[$r] = [
+			'c.ref' => '(PO\d{4}-\d{4}|PORDER.{1,32}$|PROV.{1,32}$)',
+			'c.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'
+		];
+
+		$this->import_updatekeys_array[$r] = ['c.ref' => 'Ref'];
+		$this->import_convertvalue_array[$r] = [
+			'c.fk_soc' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/societe/class/societe.class.php',
+				'class'   => 'Societe',
+				'method'  => 'fetch',
+				'element' => 'ThirdParty'
+			],
+			'c.fk_mode_reglement' => [
+				'rule' => 'fetchidfromcodeorlabel',
+				'file' => '/compta/paiement/class/cpaiement.class.php',
+				'class' => 'Cpaiement',
+				'method' => 'fetch',
+				'element' => 'cpayment'
+			],
+			'c.source' => ['rule' => 'zeroifnull'],
+		];
+
+		//Import PO Lines
+		$r++;
+		$this->import_code[$r] = 'commande_fournisseurdet_'.$r;
+		$this->import_label[$r] = 'PO Lines';
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = [];
+		$this->import_tables_array[$r] = ['cd' => MAIN_DB_PREFIX . 'commande_fournisseurdet', 'extra' => MAIN_DB_PREFIX . 'commande_fournisseurdet_extrafields'];
+		$this->import_fields_array[$r] = [
+			'cd.fk_commande'    => 'Document Ref*',
+			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_product'     => 'IdProduct',
+			'cd.label'          => 'Label',
+			'cd.description'    => 'LineDescription',
+			'cd.tva_tx'         => 'LineVATRate',
+			'cd.qty'            => 'LineQty',
+			'cd.remise_percent' => 'Reduc. Percent',
+			'cd.remise'         => 'Reduc.',
+			'cd.subprice'       => 'Sub Price',
+			'cd.total_ht'       => 'LineTotalHT',
+			'cd.total_tva'      => 'LineTotalVAT',
+			'cd.total_ttc'      => 'LineTotalTTC',
+			'cd.product_type'   => 'TypeOfLineServiceOrProduct',
+			'cd.date_start'     => 'Start Date',
+			'cd.date_end'       => 'End Date',
+			'cd.info_bits'      => 'InfoBits',
+			'cd.special_code'   => 'Special Code',
+			'cd.rang'           => 'LinePosition',
+			'cd.fk_unit'        => 'Unit'
+		];
+
+		if (! empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+
+		// Add extra fields
+		$sql="SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'commande_fournisseurdet' AND entity IN (0, " . $conf->entity . ")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.' . $obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+			}
+		}
+		// End add extra fields
+
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'commande_fournisseurdet'];
+		$this->import_regex_array[$r] = [
+			'cd.product_type'       => '[0|1]$',
+			'cd.fk_product'         => 'rowid@' . MAIN_DB_PREFIX . 'product',
+			'cd.multicurrency_code' => 'code@' . MAIN_DB_PREFIX . 'multicurrency'
+		];
+		$this->import_updatekeys_array[$r] = ['cd.fk_commande' => 'Purchase Order Id'];
+		$this->import_convertvalue_array[$r] = [
+			'cd.fk_commande' => [
+				'rule'    => 'fetchidfromref',
+				'file'    => '/fourn/class/fournisseur.commande.class.php',
+				'class'   => 'CommandeFournisseur',
+				'method'  => 'fetch',
+				'element' => 'order_supplier'
+			],
+			'cd.info_bits' => ['rule' => 'zeroifnull'],
+			'cd.special_code' => ['rule' => 'zeroifnull'],
+		];
 	}
 
 
@@ -835,7 +987,7 @@ class modFournisseur extends DolibarrModules
 	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
 	 *		It also creates data directories
 	 *
-     *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
 	public function init($options = '')
diff --git a/htdocs/core/modules/modHoliday.class.php b/htdocs/core/modules/modHoliday.class.php
index 6673f55711c..a146a855ccb 100644
--- a/htdocs/core/modules/modHoliday.class.php
+++ b/htdocs/core/modules/modHoliday.class.php
@@ -177,7 +177,7 @@ class modHoliday extends DolibarrModules
 		$this->rights[$r][0] = 20005; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/modify leave requests for everybody'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write_all'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
+		$this->rights[$r][4] = 'writeall_advance'; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->permkey->level1->level2)
 		$r++;
 
diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
new file mode 100644
index 00000000000..42e906a15f2
--- /dev/null
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -0,0 +1,129 @@
+<?php
+/* Copyright (C) 2003       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2012  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@capnetworks.com>
+ * Copyright (C) 2019       Open-DSI                <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/core/modules/modIntracommreport.class.php
+ * 	\ingroup    Intracomm report
+ *	\brief      Module to activate intracomm report module
+ */
+include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+
+
+/**
+ *  Description and activation class for module intracommreport
+ */
+class modIntracommreport extends DolibarrModules
+{
+	/**
+	 *   Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 *   @param      DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+        global $conf, $langs;
+
+        $this->db = $db;
+        $this->numero = 68000;
+
+        $this->family = "financial";
+        $this->module_position = '100';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i', '', get_class($this));
+        $this->description = "Intracomm report management (Support for French DEB/DES format)";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
+        $this->version = 'development';
+
+        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+        $this->picto = 'intracommreport';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array('/intracommreport/temp');
+
+        // Config pages
+        $this->config_page_url = array("intracommreport.php@intracommreport");
+
+		// Dependencies
+		$this->depends = array("modFacture","modTax");  // List of modules id that must be enabled if this module is enabled
+		$this->requiredby = array();                    // List of modules id to disable if this one is disabled
+		$this->conflictwith = array();                  // List of modules id this module is in conflict with
+		$this->phpmin = array(5,5);                     // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(13, 0, -5);     // Minimum version of Dolibarr required by module
+		$this->langfiles = array("intracommreport");
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(0=>array('MYMODULE_MYNEWCONST1','chaine','myvalue','This is a constant to add',1),
+		//                             1=>array('MYMODULE_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
+		// );
+		$this->const = array();
+
+        // Tabs
+        $this->tabs = array();
+
+        // Css
+        $this->module_parts = array();
+
+        // Boxes
+        $this->boxes = array();
+
+        // Dictionaries
+	    if (! isset($conf->intracommreport->enabled))
+        {
+        	$conf->intracommreport=new stdClass();
+        	$conf->intracommreport->enabled=0;
+        }
+		$this->dictionaries=array();
+
+        // Permissions
+		$this->rights = array();
+		$this->rights_class = 'intracommreport';
+        $r = 0;
+
+        $r++;
+        $this->rights[$r][0] = 68001;
+        $this->rights[$r][1] = 'Read intracomm report';
+        $this->rights[$r][2] = 'r';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'read';
+
+        $r++;
+        $this->rights[$r][0] = 68002;
+        $this->rights[$r][1] = 'Create/modify intracomm report';
+        $this->rights[$r][2] = 'w';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'write';
+
+		$r++;
+        $this->rights[$r][0] = 68004;
+        $this->rights[$r][1] = 'Delete intracomm report';
+        $this->rights[$r][2] = 'd';
+        $this->rights[$r][3] = 0;
+        $this->rights[$r][4] = 'delete';
+
+		// Main menu entries
+		$this->menu = array();			// List of menus to add
+		$r=0;
+
+		// Exports
+		$r=1;
+	}
+}
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index b7901e38fd7..012bb2d576a 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -33,155 +33,155 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modMrp extends DolibarrModules
 {
-    /**
-     * Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * @param DoliDB $db Database handler
-     */
-    public function __construct($db)
-    {
-        global $langs, $conf;
-        $this->db = $db;
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+		$this->db = $db;
 
-        // Id for module (must be unique).
-        // Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 660;
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'mrp';
-        // Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
-        // It is used to group modules by family in module setup page
-        $this->family = "products";
-        // Module position in the family on 2 digits ('01', '10', '20', ...)
-        $this->module_position = '66';
-        // Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
-        //$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
-        // Module label (no space allowed), used if translation string 'ModuleMrpName' not found (Mrp is name of module).
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description, used if translation string 'ModuleMrpDesc' not found (Mrp is name of module).
-        $this->description = "Module to Manage Manufacturing Orders (MO)";
-        // Used only if file README.md and README-LL.md not found.
-        $this->descriptionlong = "Module to Manage Manufacturing Orders (MO)";
-        // Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-        $this->version = 'dolibarr';
-        // Url to the file with your last numberversion of this module
-        //$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 660;
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'mrp';
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "products";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '66';
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleMrpName' not found (Mrp is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleMrpDesc' not found (Mrp is name of module).
+		$this->description = "Module to Manage Manufacturing Orders (MO)";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "Module to Manage Manufacturing Orders (MO)";
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'dolibarr';
+		// Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 
-        // Key used in llx_const table to save module status enabled/disabled (where MRP is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
-        $this->picto = 'mrp';
-        // Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory (core/triggers)
-            'triggers' => 0,
-            // Set this to 1 if module has its own login method file (core/login)
-            'login' => 0,
-            // Set this to 1 if module has its own substitution function file (core/substitutions)
-            'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory (core/menus)
-            'menus' => 0,
-            // Set this to 1 if module overwrite template dir (core/tpl)
-            'tpl' => 0,
-            // Set this to 1 if module has its own barcode directory (core/modules/barcode)
-            'barcode' => 0,
-            // Set this to 1 if module has its own models directory (core/modules/xxx)
-            'models' => 0,
-            // Set this to 1 if module has its own theme directory (theme)
-            'theme' => 0,
-            // Set this to relative path of css file if module has its own css file
-            'css' => array(
-                //    '/mrp/css/mrp.css.php',
-            ),
-            // Set this to relative path of js file if module must load a js on all pages
-            'js' => array(
-                //   '/mrp/js/mrp.js.php',
-            ),
-            // Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
-            'hooks' => array(
-                //   'data' => array(
-                //       'hookcontext1',
-                //       'hookcontext2',
-                //   ),
-                //   'entity' => '0',
-            ),
-            // Set this to 1 if features of module are opened to external users
-            'moduleforexternal' => 0,
-        );
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/mrp/temp","/mrp/subdir");
-        $this->dirs = array("/mrp/temp");
-        // Config pages. Put here list of php page, stored into mrp/admin directory, to use to setup module.
-        $this->config_page_url = array("mrp.php");
-        // Dependencies
-        // A condition to hide module
-        $this->hidden = false;
-        // List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
-        $this->depends = array('modBom');
-        $this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
-        $this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
-        $this->langfiles = array("mrp");
-        $this->phpmin = array(5, 5); // Minimum version of PHP required by module
-        $this->need_dolibarr_version = array(8, 0); // Minimum version of Dolibarr required by module
-        $this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        $this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
-        //$this->automatic_activation = array('FR'=>'MrpWasAutomaticallyActivatedBecauseOfYourCountryChoice');
-        //$this->always_enabled = true;								// If true, can't be disabled
+		// Key used in llx_const table to save module status enabled/disabled (where MRP is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'mrp';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 0,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 0,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/mrp/css/mrp.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/mrp/js/mrp.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/mrp/temp","/mrp/subdir");
+		$this->dirs = array("/mrp/temp");
+		// Config pages. Put here list of php page, stored into mrp/admin directory, to use to setup module.
+		$this->config_page_url = array("mrp.php");
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array('modBom');
+		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->langfiles = array("mrp");
+		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(8, 0); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		//$this->automatic_activation = array('FR'=>'MrpWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
 
-        // Constants
-        // List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example: $this->const=array(1 => array('MRP_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
-        //                             2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
-        // );
-        $this->const = array(
-        	1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of MO', 0),
-        	2=>array('MRP_MO_ADDON', 'chaine', 'mod_mo_standard', 'Name of numbering rules of MO', 0),
-        	3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/mrps', '', 0)
-        );
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('MRP_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('MRP_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array(
+			1=>array('MRP_MO_ADDON_PDF', 'chaine', 'alpha', 'Name of PDF model of MO', 0),
+			2=>array('MRP_MO_ADDON', 'chaine', 'mod_mo_standard', 'Name of numbering rules of MO', 0),
+			3=>array('MRP_MO_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/mrps', '', 0)
+		);
 
-        // Some keys to add into the overwriting translation tables
-        /*$this->overwrite_translation = array(
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
             'en_US:ParentCompany'=>'Parent company or reseller',
             'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
         )*/
 
-        if (!isset($conf->mrp) || !isset($conf->mrp->enabled)) {
-            $conf->mrp = new stdClass();
-            $conf->mrp->enabled = 0;
-        }
+		if (!isset($conf->mrp) || !isset($conf->mrp->enabled)) {
+			$conf->mrp = new stdClass();
+			$conf->mrp->enabled = 0;
+		}
 
-        // Array to add new pages in new tabs
-        $this->tabs = array();
-        // Example:
-        // $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@mrp:$user->rights->mrp->read:/mrp/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mrp:$user->rights->othermodule->read:/mrp/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
-        // $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
-        //
-        // Where objecttype can be
-        // 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
-        // 'contact'          to add a tab in contact view
-        // 'contract'         to add a tab in contract view
-        // 'group'            to add a tab in group view
-        // 'intervention'     to add a tab in intervention view
-        // 'invoice'          to add a tab in customer invoice view
-        // 'invoice_supplier' to add a tab in supplier invoice view
-        // 'member'           to add a tab in fundation member view
-        // 'opensurveypoll'	  to add a tab in opensurvey poll view
-        // 'order'            to add a tab in customer order view
-        // 'order_supplier'   to add a tab in supplier order view
-        // 'payment'		  to add a tab in payment view
-        // 'payment_supplier' to add a tab in supplier payment view
-        // 'product'          to add a tab in product view
-        // 'propal'           to add a tab in propal view
-        // 'project'          to add a tab in project view
-        // 'stock'            to add a tab in stock view
-        // 'thirdparty'       to add a tab in third party view
-        // 'user'             to add a tab in user view
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@mrp:$user->rights->mrp->read:/mrp/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@mrp:$user->rights->othermodule->read:/mrp/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
 
-        // Dictionaries
-        $this->dictionaries = array();
-        /* Example:
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@mrp',
             // List of tables we want to see into dictonnary editor
@@ -205,68 +205,68 @@ class modMrp extends DolibarrModules
         );
         */
 
-        // Boxes/Widgets
-        // Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget.
-        $this->boxes = array(
-            0 => array('file' => 'box_mos.php', 'note' => '', 'enabledbydefaulton' => 'Home')
-        );
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			0 => array('file' => 'box_mos.php', 'note' => '', 'enabledbydefaulton' => 'Home')
+		);
 
-        // Cronjobs (List of cron jobs entries to add when module is enabled)
-        // unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
-        $this->cronjobs = array(
-            //  0 => array(
-            //      'label' => 'MyJob label',
-            //      'jobtype' => 'method',
-            //      'class' => '/mrp/class/mo.class.php',
-            //      'objectname' => 'Mo',
-            //      'method' => 'doScheduledJob',
-            //      'parameters' => '',
-            //      'comment' => 'Comment',
-            //      'frequency' => 2,
-            //      'unitfrequency' => 3600,
-            //      'status' => 0,
-            //      'test' => '$conf->mrp->enabled',
-            //      'priority' => 50,
-            //  ),
-        );
-        // Example: $this->cronjobs=array(
-        //    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50),
-        //    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50)
-        // );
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/mrp/class/mo.class.php',
+			//      'objectname' => 'Mo',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->mrp->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->mrp->enabled', 'priority'=>50)
+		// );
 
-        // Permissions provided by this module
-        $this->rights = array();
-        $r = 0;
-        // Add here entries to declare new permissions
-        /* BEGIN MODULEBUILDER PERMISSIONS */
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Read Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Create/Update Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        $this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
-        $this->rights[$r][1] = 'Delete Manufacturing Order'; // Permission label
-        $this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
-        $r++;
-        /* END MODULEBUILDER PERMISSIONS */
+		// Permissions provided by this module
+		$this->rights = array();
+		$r = 0;
+		// Add here entries to declare new permissions
+		/* BEGIN MODULEBUILDER PERMISSIONS */
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete Manufacturing Order'; // Permission label
+		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->mrp->level1->level2)
+		$r++;
+		/* END MODULEBUILDER PERMISSIONS */
 
-        // Main menu entries to add
-        $this->menu = array();
-        $r = 0;
-        // Add here entries to declare new menus
-        /* BEGIN MODULEBUILDER TOPMENU */
+		// Main menu entries to add
+		$this->menu = array();
+		$r = 0;
+		// Add here entries to declare new menus
+		/* BEGIN MODULEBUILDER TOPMENU */
 		/* END MODULEBUILDER LEFTMENU MO */
 
-        // Exports profiles provided by this module
-        $r = 1;
-        /* BEGIN MODULEBUILDER EXPORT MO */
-        /*
+		// Exports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER EXPORT MO */
+		/*
         $langs->load("mrp");
         $this->export_code[$r]=$this->rights_class.'_'.$r;
         $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -281,12 +281,12 @@ class modMrp extends DolibarrModules
         $this->export_sql_end[$r] .=' WHERE 1 = 1';
         $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
         $r++; */
-        /* END MODULEBUILDER EXPORT MO */
+		/* END MODULEBUILDER EXPORT MO */
 
-        // Imports profiles provided by this module
-        $r = 1;
-        /* BEGIN MODULEBUILDER IMPORT MO */
-        /*
+		// Imports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER IMPORT MO */
+		/*
          $langs->load("mrp");
          $this->export_code[$r]=$this->rights_class.'_'.$r;
          $this->export_label[$r]='MoLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
@@ -301,75 +301,75 @@ class modMrp extends DolibarrModules
          $this->export_sql_end[$r] .=' WHERE 1 = 1';
          $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('mo').')';
          $r++; */
-        /* END MODULEBUILDER IMPORT MO */
-    }
+		/* END MODULEBUILDER IMPORT MO */
+	}
 
-    /**
-     *  Function called when module is enabled.
-     *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-     *  It also creates data directories
-     *
-     *  @param      string  $options    Options when enabling module ('', 'noboxes')
-     *  @return     int             	1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
-    	global $conf, $langs;
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
 
-        $result = $this->_load_tables('/mrp/sql/');
-        if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		$result = $this->_load_tables('/mrp/sql/');
+		if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
 
-        // Create extrafields during init
-        //include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-        //$extrafields = new ExtraFields($this->db);
-        //$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
-        //$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		// Create extrafields during init
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result2=$extrafields->addExtraField('myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
+		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'mrp', '$conf->mrp->enabled');
 
-        // Permissions
-        $this->remove($options);
+		// Permissions
+		$this->remove($options);
 
-        $sql = array();
+		$sql = array();
 
-        // ODT template
-        $src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mrps/template_mo.odt';
-        $dirodt = DOL_DATA_ROOT.'/doctemplates/mrps';
-        $dest = $dirodt.'/template_mo.odt';
+		// ODT template
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mrps/template_mo.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/mrps';
+		$dest = $dirodt.'/template_mo.odt';
 
-        if (file_exists($src) && !file_exists($dest))
-        {
-        	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        	dol_mkdir($dirodt);
-        	$result = dol_copy($src, $dest, 0, 0);
-        	if ($result < 0)
-        	{
-        		$langs->load("errors");
-        		$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
-        		return 0;
-        	}
-        }
+		if (file_exists($src) && !file_exists($dest))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+			dol_mkdir($dirodt);
+			$result = dol_copy($src, $dest, 0, 0);
+			if ($result < 0)
+			{
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+				return 0;
+			}
+		}
 
-        $sql = array(
-        	//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
-        	//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
-        );
+		$sql = array(
+			//"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape('standard')."' AND type = 'mo' AND entity = ".$conf->entity,
+			//"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape('standard')."', 'mo', ".$conf->entity.")"
+		);
 
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     *  Function called when module is disabled.
-     *  Remove from database constants, boxes and permissions from Dolibarr database.
-     *  Data directories are not deleted
-     *
-     *  @param      string	$options    Options when enabling module ('', 'noboxes')
-     *  @return     int                 1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
-        return $this->_remove($sql, $options);
-    }
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index e1a1a51160a..3ed99741715 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -477,7 +477,14 @@ class modProduct extends DolibarrModules
 					'class' => 'Ccountry',
 					'method' => 'fetch',
 					'dict' => 'DictionaryCountry'
-				)
+				),
+				'p.finished'=> array(
+					'rule' => 'fetchidfromcodeorlabel',
+					'classfile' => '/core/class/cproductnature.class.php',
+					'class' => 'CProductNature',
+					'method' => 'fetch',
+					'dict' => 'DictionaryProductNature'
+					),
 		);
 
 		$this->import_regex_array[$r] = array(
@@ -488,7 +495,6 @@ class modProduct extends DolibarrModules
 			'p.fk_product_type' => '^[0|1]$',
 			'p.datec' => '^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$',
 			'p.recuperableonly' => '^[0|1]$',
-			'p.finished' => '^[0|1]$'
 		);
 
 		if (!empty($conf->stock->enabled)) {//if Stock module enabled
@@ -578,7 +584,7 @@ class modProduct extends DolibarrModules
 			'p.surface_units' => 'm2', // Use a unit of measure from the dictionary. m2/cm2/mm2 etc....matches field "Short label" for unit type "surface" in table "' . MAIN_DB_PREFIX . 'c_units',
 			'p.volume' => "",
 			'p.volume_units' => 'm3', //Use a unit of measure from the dictionary. m3/cm3/mm3 etc....matches field "Short label" for unit type "volume" in table "' . MAIN_DB_PREFIX . 'c_units',
-			'p.finished' => '0 (raw material) / 1 (finished goods)'
+			'p.finished' => '0 (raw material) / 1 (finished goods), matches field "code" in dictionary table "'.MAIN_DB_PREFIX.'c_product_nature"'
 		);
 		//clauses copied from import_fields_array
 		if (!empty($conf->stock->enabled)) $import_sample = array_merge($import_sample, array(
@@ -654,6 +660,10 @@ class modProduct extends DolibarrModules
 				));
 			}
 
+			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				$this->import_fields_array[$r]=array_merge($this->import_fields_array[$r], array('sp.packaging' => 'PackagingForThisProduct'));
+			}
+
 			$this->import_convertvalue_array[$r] = array(
 					'sp.fk_soc'=>array('rule'=>'fetchidfromref', 'classfile'=>'/societe/class/societe.class.php', 'class'=>'Societe', 'method'=>'fetch', 'element'=>'ThirdParty'),
 					'sp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
@@ -692,6 +702,11 @@ class modProduct extends DolibarrModules
 					'sp.multicurrency_price'=>''
 				));
 			}
+			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
+					'sp.packagning'=>'1',
+				));
+			}
 
 			$this->import_updatekeys_array[$r] = array('sp.fk_product'=>'ProductOrService', 'sp.ref_fourn'=>'SupplierRef', 'sp.fk_soc'=>'Supplier');
 		}
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 4da02808251..5791998ff6a 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -262,11 +262,11 @@ class modPropale extends DolibarrModules
 
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'_'.$r;
-		$this->import_label[$r] = 'Proposals';	// Translation key
+		$this->import_label[$r] = 'Proposals'; // Translation key
 		$this->import_icon[$r] = $this->picto;
-		$this->import_entities_array[$r] = [];		// We define here only fields that use another icon that the one defined into import_icon
-		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX . 'propal', 'extra' => MAIN_DB_PREFIX . 'propal_extrafields'];
-		$this->import_tables_creator_array[$r] = ['c'=>'fk_user_author'];	// Fields to store import user id
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = ['c' => MAIN_DB_PREFIX.'propal', 'extra' => MAIN_DB_PREFIX.'propal_extrafields'];
+		$this->import_tables_creator_array[$r] = ['c'=>'fk_user_author']; // Fields to store import user id
 		$this->import_fields_array[$r] = [
 			'c.ref' => 'Document Ref*',
 			'c.ref_client' => 'RefCustomer',
@@ -282,7 +282,7 @@ class modPropale extends DolibarrModules
 			'c.date_livraison' => 'DeliveryDate',
 			'c.fk_user_valid' => 'ValidatedById'
 		];
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['c.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['c.multicurrency_tx'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['c.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -291,18 +291,18 @@ class modPropale extends DolibarrModules
 		}
 		// Add extra fields
 		$import_extrafield_sample = [];
-		$sql = "SELECT name, label, fieldrequired FROM " . MAIN_DB_PREFIX . "extrafields WHERE elementtype = 'propal' AND entity IN (0, " . $conf->entity . ")";
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'propal' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 				$import_extrafield_sample[$fieldname] = $fieldlabel;
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'propal'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'propal'];
 		$this->import_regex_array[$r] = ['c.ref' => '[^ ]'];
 		$import_sample = [
 			'c.ref' => 'PROV0077',
@@ -339,12 +339,12 @@ class modPropale extends DolibarrModules
 		//Import Proposal Lines
 		$r++;
 		$this->import_code[$r] = $this->rights_class.'line_'.$r;
-		$this->import_label[$r] = "ProposalLine";	// Translation key
+		$this->import_label[$r] = "ProposalLine"; // Translation key
 		$this->import_icon[$r] = $this->picto;
-		$this->import_entities_array[$r] = [];		// We define here only fields that use another icon that the one defined into import_icon
+		$this->import_entities_array[$r] = []; // We define here only fields that use another icon that the one defined into import_icon
 		$this->import_tables_array[$r] = [
-			'cd' => MAIN_DB_PREFIX . 'propaldet',
-			'extra' => MAIN_DB_PREFIX . 'propaldet_extrafields'
+			'cd' => MAIN_DB_PREFIX.'propaldet',
+			'extra' => MAIN_DB_PREFIX.'propaldet_extrafields'
 		];
 		$this->import_fields_array[$r] = [
 			'cd.fk_propal' => 'Document Ref*',
@@ -366,7 +366,7 @@ class modPropale extends DolibarrModules
 			'cd.date_end' => 'End Date',
 			'cd.buy_price_ht' => 'LineBuyPriceHT'
 		];
-		if (! empty($conf->multicurrency->enabled)) {
+		if (!empty($conf->multicurrency->enabled)) {
 			$this->import_fields_array[$r]['cd.multicurrency_code'] = 'Currency';
 			$this->import_fields_array[$r]['cd.multicurrency_subprice'] = 'CurrencyRate';
 			$this->import_fields_array[$r]['cd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
@@ -379,14 +379,14 @@ class modPropale extends DolibarrModules
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.' . $obj->name;
+				$fieldname = 'extra.'.$obj->name;
 				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel . ($obj->fieldrequired ? '*' : '');
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
 				$import_extrafield_sample[$fieldname] = $fieldlabel;
 			}
 		}
 		// End add extra fields
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-' . MAIN_DB_PREFIX . 'propaldet'];
+		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'propaldet'];
 		$this->import_regex_array[$r] = ['cd.product_type' => '[0|1]$'];
 		$import_sample = [
 			'cd.fk_propal' => 'PROV(0001)',
diff --git a/htdocs/core/modules/modReceiptPrinter.class.php b/htdocs/core/modules/modReceiptPrinter.class.php
index 818c090dcc0..32124dc8f5b 100644
--- a/htdocs/core/modules/modReceiptPrinter.class.php
+++ b/htdocs/core/modules/modReceiptPrinter.class.php
@@ -136,7 +136,7 @@ class modReceiptPrinter extends DolibarrModules
         // Clean before activation
         $this->remove($options);
 
-        $templateexample = '<dol_align_center>\r\n<dol_print_text><dol_value_mysoc_name>\r\n<dol_print_text><dol_value_mysoc_address>\r\n<dol_print_text><dol_value_mysoc_zip><dol_value_mysoc_town>\r\n<dol_line_feed>\r\n<dol_print_text>Facture <dol_value_object_ref>\r\n<dol_line_feed>\r\n<dol_align_left>\r\n<dol_print_object_lines>\r\n<dol_line_feed>\r\n<dol_print_object_tax>\r\n<dol_line_feed>\r\n<dol_print_object_total>\r\n<dol_line_feed>\r\n<dol_cut_paper_full>';
+        $templateexample = '{dol_align_center}\r\n{dol_print_text}{dol_value_mysoc_name}\r\n{dol_print_text}{dol_value_mysoc_address}\r\n{dol_print_text}{dol_value_mysoc_zip}{dol_value_mysoc_town}\r\n{dol_line_feed}\r\n{dol_print_text}Facture {dol_value_object_ref}\r\n{dol_line_feed}\r\n{dol_align_left}\r\n{dol_print_object_lines}\r\n{dol_line_feed}\r\n{dol_print_object_tax}\r\n{dol_line_feed}\r\n{dol_print_object_total}\r\n{dol_line_feed}\r\n{dol_cut_paper_full}';
         $sql = array(
             "CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), fk_type integer, fk_profile integer, parameter varchar(128), entity integer) ENGINE=innodb;",
             "CREATE TABLE IF NOT EXISTS ".MAIN_DB_PREFIX."printer_receipt_template (rowid integer AUTO_INCREMENT PRIMARY KEY, name varchar(128), template text, entity integer) ENGINE=innodb;",
diff --git a/htdocs/core/modules/modSocialNetworks.class.php b/htdocs/core/modules/modSocialNetworks.class.php
index a51a83a8743..bf7573a912b 100644
--- a/htdocs/core/modules/modSocialNetworks.class.php
+++ b/htdocs/core/modules/modSocialNetworks.class.php
@@ -66,7 +66,7 @@ class modSocialNetworks extends DolibarrModules
 
 		// Dependencies
 		$this->hidden = !empty($conf->global->MODULE_SOCIALNETWORKS_DISABLED); // A condition to hide module
-		$this->depends = array('modSociete'); // List of module class names as string that must be enabled if this module is enabled
+		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 0b5e54e9637..68fe7f2eb22 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -129,9 +129,9 @@ class modTicket extends DolibarrModules
         		'SELECT f.rowid as rowid, f.code, f.pos, f.label, f.active, f.use_default FROM '.MAIN_DB_PREFIX.'c_ticket_resolution as f'
         	),
         	'tabsqlsort' => array("pos ASC", "pos ASC", "pos ASC", "pos ASC"),
-        	'tabfield' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
-        	'tabfieldvalue' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
-        	'tabfieldinsert' => array("pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default", "pos,code,label,use_default"),
+        	'tabfield' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
+        	'tabfieldvalue' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
+        	'tabfieldinsert' => array("code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default", "code,label,pos,use_default"),
             'tabrowid' => array("rowid", "rowid", "rowid", "rowid"),
         	'tabcond' => array($conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled, $conf->ticket->enabled),
         	'tabhelp' => array(array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1")), array('code'=>$langs->trans("EnterAnyCode"), 'use_default'=>$langs->trans("Enter0or1"))),
diff --git a/htdocs/core/modules/modWebServicesClient.class.php b/htdocs/core/modules/modWebServicesClient.class.php
index 720a756a828..52a8889fbbb 100644
--- a/htdocs/core/modules/modWebServicesClient.class.php
+++ b/htdocs/core/modules/modWebServicesClient.class.php
@@ -30,54 +30,54 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 class modWebServicesClient extends DolibarrModules
 {
 
-    /**
+	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
 	 *   @param      DoliDB		$db      Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-        $this->numero = 2660;
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+		$this->numero = 2660;
 
-        $this->family = "interface";
-        $this->module_position = '25';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        $this->description = "Enable the web service client to call external supplier web services";
+		$this->family = "interface";
+		$this->module_position = '25';
+		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		$this->description = "Enable the web service client to call external supplier web services";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'experimental';
-        // Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-        // Name of image file used for this module.
-        $this->picto = 'technic';
+		$this->version = 'experimental';
+		// Key used in llx_const table to save module status enabled/disabled (where MYMODULE is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		$this->picto = 'technic';
 
-        // Data directories to create when module is enabled
-        $this->dirs = array();
+		// Data directories to create when module is enabled
+		$this->dirs = array();
 
-        // Config pages
-        //$this->config_page_url = array();
+		// Config pages
+		//$this->config_page_url = array();
 
-        // Dependencies
-        $this->hidden = false; // A condition to hide module
+		// Dependencies
+		$this->hidden = false; // A condition to hide module
 		$this->depends = array(); // List of module class names as string that must be enabled if this module is enabled
 		$this->requiredby = array(); // List of module ids to disable if this one is disabled
 		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
 		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
-        $this->langfiles = array("other");
+		$this->langfiles = array("other");
 
-        // Constants
-        $this->const = array();
+		// Constants
+		$this->const = array();
 
-        // New pages on tabs
-        $this->tabs = array();
+		// New pages on tabs
+		$this->tabs = array();
 
-        // Boxes
-        $this->boxes = array();
+		// Boxes
+		$this->boxes = array();
 
-        // Permissions
-        $this->rights = array();
-        $this->rights_class = 'syncsupplierwebservices';
-        $r = 0;
-    }
+		// Permissions
+		$this->rights = array();
+		$this->rights_class = 'syncsupplierwebservices';
+		$r = 0;
+	}
 }
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 0312aa061f8..e1f765110a8 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -35,478 +35,478 @@ use OAuth\OAuth2\Service\Google;
  */
 class printing_printgcp extends PrintingDriver
 {
-    public $name = 'printgcp';
-    public $desc = 'PrintGCPDesc';
+	public $name = 'printgcp';
+	public $desc = 'PrintGCPDesc';
 
-    /**
-     * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-     */
-    public $picto = 'printer';
-    public $active = 'PRINTING_PRINTGCP';
-    public $conf = array();
-    public $google_id = '';
-    public $google_secret = '';
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'printer';
+	public $active = 'PRINTING_PRINTGCP';
+	public $conf = array();
+	public $google_id = '';
+	public $google_secret = '';
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error = '';
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
 
-    /**
-     * @var string[] Error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string[] Error codes (or messages)
+	 */
+	public $errors = array();
 
-    /**
-     * @var DoliDB Database handler.
-     */
-    public $db;
+	/**
+	 * @var DoliDB Database handler.
+	 */
+	public $db;
 
-    private $OAUTH_SERVICENAME_GOOGLE = 'Google';
+	private $OAUTH_SERVICENAME_GOOGLE = 'Google';
 
-    const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
-    const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/search';
-    const PRINTERS_GET_JOBS = 'https://www.google.com/cloudprint/jobs';
-    const PRINT_URL = 'https://www.google.com/cloudprint/submit';
+	const LOGIN_URL = 'https://accounts.google.com/o/oauth2/token';
+	const PRINTERS_SEARCH_URL = 'https://www.google.com/cloudprint/search';
+	const PRINTERS_GET_JOBS = 'https://www.google.com/cloudprint/jobs';
+	const PRINT_URL = 'https://www.google.com/cloudprint/submit';
 
-    /**
-     *  Constructor
-     *
-     *  @param      DoliDB      $db      Database handler
-     */
-    public function __construct($db)
-    {
-        global $conf, $langs, $dolibarr_main_url_root;
+	/**
+	 *  Constructor
+	 *
+	 *  @param      DoliDB      $db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $dolibarr_main_url_root;
 
-        // Define $urlwithroot
-        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
-        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
-        //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+		// Define $urlwithroot
+		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+		$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+		//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-        $this->db = $db;
+		$this->db = $db;
 
-        if (!$conf->oauth->enabled) {
-            $this->conf[] = array(
-                'varname'=>'PRINTGCP_INFO',
-                'info'=>$langs->transnoentitiesnoconv("WarningModuleNotActive", "OAuth"),
-                'type'=>'info',
-            );
-        } else {
-            $this->google_id = $conf->global->OAUTH_GOOGLE_ID;
-            $this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
-            // Token storage
-            $storage = new DoliStorage($this->db, $this->conf);
-            //$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
-            // Setup the credentials for the requests
-            $credentials = new Credentials(
-                $this->google_id,
-                $this->google_secret,
-                $urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
-            );
-            $access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? 'HasAccessToken' : 'NoAccessToken');
-            $serviceFactory = new \OAuth\ServiceFactory();
-            $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-            $token_ok = true;
-            try {
-                $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $token_ok = false;
-            }
-            //var_dump($this->errors);exit;
+		if (!$conf->oauth->enabled) {
+			$this->conf[] = array(
+				'varname'=>'PRINTGCP_INFO',
+				'info'=>$langs->transnoentitiesnoconv("WarningModuleNotActive", "OAuth"),
+				'type'=>'info',
+			);
+		} else {
+			$this->google_id = $conf->global->OAUTH_GOOGLE_ID;
+			$this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
+			// Token storage
+			$storage = new DoliStorage($this->db, $this->conf);
+			//$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
+			// Setup the credentials for the requests
+			$credentials = new Credentials(
+				$this->google_id,
+				$this->google_secret,
+				$urlwithroot.'/core/modules/oauth/google_oauthcallback.php'
+			);
+			$access = ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? 'HasAccessToken' : 'NoAccessToken');
+			$serviceFactory = new \OAuth\ServiceFactory();
+			$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+			$token_ok = true;
+			try {
+				$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$token_ok = false;
+			}
+			//var_dump($this->errors);exit;
 
-            $expire = false;
-            // Is token expired or will token expire in the next 30 seconds
-            if ($token_ok) {
-                $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-            }
+			$expire = false;
+			// Is token expired or will token expire in the next 30 seconds
+			if ($token_ok) {
+				$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+			}
 
-            // Token expired so we refresh it
-            if ($token_ok && $expire) {
-                try {
-                    // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                    $refreshtoken = $token->getRefreshToken();
-                    $token = $apiService->refreshAccessToken($token);
-                    $token->setRefreshToken($refreshtoken);
-                    $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-                } catch (Exception $e) {
-                    $this->errors[] = $e->getMessage();
-                }
-            }
-            if ($this->google_id != '' && $this->google_secret != '') {
-                $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
-                $this->conf[] = array(
-                    'varname'=>'PRINTGCP_TOKEN_ACCESS',
-                    'info'=>$access,
-                    'type'=>'info',
-                    'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'),
-                    'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '')
-                );
-                if ($token_ok) {
-                    $expiredat = '';
+			// Token expired so we refresh it
+			if ($token_ok && $expire) {
+				try {
+					// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+					$refreshtoken = $token->getRefreshToken();
+					$token = $apiService->refreshAccessToken($token);
+					$token->setRefreshToken($refreshtoken);
+					$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
+			}
+			if ($this->google_id != '' && $this->google_secret != '') {
+				$this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthConfigured', 'type'=>'info');
+				$this->conf[] = array(
+					'varname'=>'PRINTGCP_TOKEN_ACCESS',
+					'info'=>$access,
+					'type'=>'info',
+					'renew'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?state=userinfo_email,userinfo_profile,cloud_print&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'),
+					'delete'=>($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE) ? $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp') : '')
+				);
+				if ($token_ok) {
+					$expiredat = '';
 
-                    $refreshtoken = $token->getRefreshToken();
+					$refreshtoken = $token->getRefreshToken();
 
-                    $endoflife = $token->getEndOfLife();
+					$endoflife = $token->getEndOfLife();
 
-                    if ($endoflife == $token::EOL_NEVER_EXPIRES)
-                    {
-                        $expiredat = $langs->trans("Never");
-                    } elseif ($endoflife == $token::EOL_UNKNOWN)
-                    {
-                        $expiredat = $langs->trans("Unknown");
-                    } else {
-                        $expiredat = dol_print_date($endoflife, "dayhour");
-                    }
+					if ($endoflife == $token::EOL_NEVER_EXPIRES)
+					{
+						$expiredat = $langs->trans("Never");
+					} elseif ($endoflife == $token::EOL_UNKNOWN)
+					{
+						$expiredat = $langs->trans("Unknown");
+					} else {
+						$expiredat = dol_print_date($endoflife, "dayhour");
+					}
 
-                    $this->conf[] = array('varname'=>'TOKEN_REFRESH', 'info'=>((!empty($refreshtoken)) ? 'Yes' : 'No'), 'type'=>'info');
-                    $this->conf[] = array('varname'=>'TOKEN_EXPIRED', 'info'=>($expire ? 'Yes' : 'No'), 'type'=>'info');
-                    $this->conf[] = array('varname'=>'TOKEN_EXPIRE_AT', 'info'=>($expiredat), 'type'=>'info');
-                }
-                /*
+					$this->conf[] = array('varname'=>'TOKEN_REFRESH', 'info'=>((!empty($refreshtoken)) ? 'Yes' : 'No'), 'type'=>'info');
+					$this->conf[] = array('varname'=>'TOKEN_EXPIRED', 'info'=>($expire ? 'Yes' : 'No'), 'type'=>'info');
+					$this->conf[] = array('varname'=>'TOKEN_EXPIRE_AT', 'info'=>($expiredat), 'type'=>'info');
+				}
+				/*
                 if ($storage->hasAccessToken($this->OAUTH_SERVICENAME_GOOGLE)) {
                     $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
                     $this->conf[] = array('varname'=>'DELETE_TOKEN', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'delete');
                 } else {
                     $this->conf[] = array('varname'=>'PRINTGCP_AUTHLINK', 'link'=>$urlwithroot.'/core/modules/oauth/google_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/printing/admin/printing.php?mode=setup&driver=printgcp'), 'type'=>'authlink');
                 }*/
-            } else {
-                $this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
-            }
-        }
-        // do not display submit button
-        $this->conf[] = array('enabled'=>0, 'type'=>'submit');
-    }
+			} else {
+				$this->conf[] = array('varname'=>'PRINTGCP_INFO', 'info'=>'GoogleAuthNotConfigured', 'type'=>'info');
+			}
+		}
+		// do not display submit button
+		$this->conf[] = array('enabled'=>0, 'type'=>'submit');
+	}
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listAvailablePrinters()
-    {
-        global $conf, $langs;
-        $error = 0;
-        $langs->load('printing');
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listAvailablePrinters()
+	{
+		global $conf, $langs;
+		$error = 0;
+		$langs->load('printing');
 
-        $html = '<tr class="liste_titre">';
-        $html .= '<td>'.$langs->trans('GCP_Name').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_displayName').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_Id').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_State').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
-        $html .= '<td>'.$langs->trans('GCP_Type').'</td>';
-        $html .= '<td class="center">'.$langs->trans("Select").'</td>';
-        $html .= '</tr>'."\n";
-        $list = $this->getlistAvailablePrinters();
-        //$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
-        foreach ($list['available'] as $printer_det)
-        {
-            $html .= '<tr class="oddeven">';
-            $html .= '<td>'.$printer_det['name'].'</td>';
-            $html .= '<td>'.$printer_det['displayName'].'</td>';
-            $html .= '<td>'.$printer_det['id'].'</td>'; // id to identify printer to use
-            $html .= '<td>'.$printer_det['ownerName'].'</td>';
-            $html .= '<td>'.$printer_det['status'].'</td>';
-            $html .= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
-            $html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
-            // Defaut
-            $html .= '<td class="center">';
-            if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
-            {
-                $html .= img_picto($langs->trans("Default"), 'on');
-            } else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
-            $html .= '</td>';
-            $html .= '</tr>'."\n";
-        }
-        $this->resprint = $html;
-        return $error;
-    }
+		$html = '<tr class="liste_titre">';
+		$html .= '<td>'.$langs->trans('GCP_Name').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_displayName').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_Id').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_OwnerName').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_State').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_connectionStatus').'</td>';
+		$html .= '<td>'.$langs->trans('GCP_Type').'</td>';
+		$html .= '<td class="center">'.$langs->trans("Select").'</td>';
+		$html .= '</tr>'."\n";
+		$list = $this->getlistAvailablePrinters();
+		//$html.= '<td><pre>'.print_r($list,true).'</pre></td>';
+		foreach ($list['available'] as $printer_det)
+		{
+			$html .= '<tr class="oddeven">';
+			$html .= '<td>'.$printer_det['name'].'</td>';
+			$html .= '<td>'.$printer_det['displayName'].'</td>';
+			$html .= '<td>'.$printer_det['id'].'</td>'; // id to identify printer to use
+			$html .= '<td>'.$printer_det['ownerName'].'</td>';
+			$html .= '<td>'.$printer_det['status'].'</td>';
+			$html .= '<td>'.$langs->trans('STATE_'.$printer_det['connectionStatus']).'</td>';
+			$html .= '<td>'.$langs->trans('TYPE_'.$printer_det['type']).'</td>';
+			// Defaut
+			$html .= '<td class="center">';
+			if ($conf->global->PRINTING_GCP_DEFAULT == $printer_det['id'])
+			{
+				$html .= img_picto($langs->trans("Default"), 'on');
+			} else $html .= '<a href="'.$_SERVER["PHP_SELF"].'?action=setvalue&amp;token='.newToken().'&amp;mode=test&amp;varname=PRINTING_GCP_DEFAULT&amp;driver=printgcp&amp;value='.urlencode($printer_det['id']).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			$html .= '</td>';
+			$html .= '</tr>'."\n";
+		}
+		$this->resprint = $html;
+		return $error;
+	}
 
 
-    /**
-     *  Return list of available printers
-     *
-     *  @return array      list of printers
-     */
-    public function getlistAvailablePrinters()
-    {
-        $ret = array();
-        // Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-        // Check if we have auth token
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-        }
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if ($token_ok) {
-            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-        }
+	/**
+	 *  Return list of available printers
+	 *
+	 *  @return array      list of printers
+	 */
+	public function getlistAvailablePrinters()
+	{
+		$ret = array();
+		// Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+		// Check if we have auth token
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+		}
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if ($token_ok) {
+			$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+		}
 
-        // Token expired so we refresh it
-        if ($token_ok && $expire) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-            }
-        }
-        // Send a request with api
-        try {
-            $response = $apiService->request(self::PRINTERS_SEARCH_URL);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            print '<pre>'.print_r($e->getMessage(), true).'</pre>';
-        }
-        //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
-        $responsedata = json_decode($response, true);
-        $printers = $responsedata['printers'];
-        // Check if we have printers?
-        if (count($printers) == 0) {
-            // We dont have printers so return blank array
-            $ret['available'] = array();
-        } else {
-            // We have printers so returns printers as array
-            $ret['available'] = $printers;
-        }
-        return $ret;
-    }
+		// Token expired so we refresh it
+		if ($token_ok && $expire) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+			}
+		}
+		// Send a request with api
+		try {
+			$response = $apiService->request(self::PRINTERS_SEARCH_URL);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			print '<pre>'.print_r($e->getMessage(), true).'</pre>';
+		}
+		//print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
+		$responsedata = json_decode($response, true);
+		$printers = $responsedata['printers'];
+		// Check if we have printers?
+		if (count($printers) == 0) {
+			// We dont have printers so return blank array
+			$ret['available'] = array();
+		} else {
+			// We have printers so returns printers as array
+			$ret['available'] = $printers;
+		}
+		return $ret;
+	}
 
-    /**
-     *  Print selected file
-     *
-     * @param   string      $file       file
-     * @param   string      $module     module
-     * @param   string      $subdir     subdir for file
-     * @return  int                     0 if OK, >0 if KO
-     */
-    public function printFile($file, $module, $subdir = '')
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	/**
+	 *  Print selected file
+	 *
+	 * @param   string      $file       file
+	 * @param   string      $module     module
+	 * @param   string      $subdir     subdir for file
+	 * @return  int                     0 if OK, >0 if KO
+	 */
+	public function printFile($file, $module, $subdir = '')
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-        global $conf, $user;
-        $error = 0;
+		global $conf, $user;
+		$error = 0;
 
-        $fileprint = $conf->{$module}->dir_output;
-        if ($subdir != '') {
-            $fileprint .= '/'.$subdir;
-        }
-        $fileprint .= '/'.$file;
-        $mimetype = dol_mimetype($fileprint);
-        // select printer uri for module order, propal,...
-        $sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$this->db->escape($module)."' AND driver='printgcp' AND userid=".$user->id;
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                $printer_id = $obj->printer_id;
-            } else {
-                if (!empty($conf->global->PRINTING_GCP_DEFAULT))
-                {
-                    $printer_id = $conf->global->PRINTING_GCP_DEFAULT;
-                } else {
-                    $this->errors[] = 'NoDefaultPrinterDefined';
-                    $error++;
-                    return $error;
-                }
-            }
-        } else {
-            dol_print_error($this->db);
-        }
+		$fileprint = $conf->{$module}->dir_output;
+		if ($subdir != '') {
+			$fileprint .= '/'.$subdir;
+		}
+		$fileprint .= '/'.$file;
+		$mimetype = dol_mimetype($fileprint);
+		// select printer uri for module order, propal,...
+		$sql = "SELECT rowid, printer_id, copy FROM ".MAIN_DB_PREFIX."printing WHERE module='".$this->db->escape($module)."' AND driver='printgcp' AND userid=".$user->id;
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				$printer_id = $obj->printer_id;
+			} else {
+				if (!empty($conf->global->PRINTING_GCP_DEFAULT))
+				{
+					$printer_id = $conf->global->PRINTING_GCP_DEFAULT;
+				} else {
+					$this->errors[] = 'NoDefaultPrinterDefined';
+					$error++;
+					return $error;
+				}
+			}
+		} else {
+			dol_print_error($this->db);
+		}
 
-        $ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
-        $this->error = 'PRINTGCP: '.$ret['errormessage'];
-        if ($ret['status'] != 1) {
-            $error++;
-        }
-        return $error;
-    }
+		$ret = $this->sendPrintToPrinter($printer_id, $file, $fileprint, $mimetype);
+		$this->error = 'PRINTGCP: '.$ret['errormessage'];
+		if ($ret['status'] != 1) {
+			$error++;
+		}
+		return $error;
+	}
 
-    /**
-     *  Sends document to the printer
-     *
-     *  @param  string      $printerid      Printer id returned by Google Cloud Print
-     *  @param  string      $printjobtitle  Job Title
-     *  @param  string      $filepath       File Path to be send to Google Cloud Print
-     *  @param  string      $contenttype    File content type by example application/pdf, image/png
-     *  @return array                       status array
-     */
-    public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
-    {
-        // Check if printer id
-        if (empty($printerid)) {
-            return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID');
-        }
-        // Open the file which needs to be print
-        $handle = fopen($filepath, "rb");
-        if (!$handle) {
-            return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'Could not read the file.');
-        }
-        // Read file content
-        $contents = fread($handle, filesize($filepath));
-        fclose($handle);
-        // Prepare post fields for sending print
-        $post_fields = array(
-            'printerid' => $printerid,
-            'title' => $printjobtitle,
-            'contentTransferEncoding' => 'base64',
-            'content' => base64_encode($contents), // encode file content as base64
-            'contentType' => $contenttype,
-        );
-        // Dolibarr Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php?service=google'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+	/**
+	 *  Sends document to the printer
+	 *
+	 *  @param  string      $printerid      Printer id returned by Google Cloud Print
+	 *  @param  string      $printjobtitle  Job Title
+	 *  @param  string      $filepath       File Path to be send to Google Cloud Print
+	 *  @param  string      $contenttype    File content type by example application/pdf, image/png
+	 *  @return array                       status array
+	 */
+	public function sendPrintToPrinter($printerid, $printjobtitle, $filepath, $contenttype)
+	{
+		// Check if printer id
+		if (empty($printerid)) {
+			return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'No provided printer ID');
+		}
+		// Open the file which needs to be print
+		$handle = fopen($filepath, "rb");
+		if (!$handle) {
+			return array('status' =>0, 'errorcode' =>'', 'errormessage'=>'Could not read the file.');
+		}
+		// Read file content
+		$contents = fread($handle, filesize($filepath));
+		fclose($handle);
+		// Prepare post fields for sending print
+		$post_fields = array(
+			'printerid' => $printerid,
+			'title' => $printjobtitle,
+			'contentTransferEncoding' => 'base64',
+			'content' => base64_encode($contents), // encode file content as base64
+			'contentType' => $contenttype,
+		);
+		// Dolibarr Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php?service=google'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
 
-        // Check if we have auth token and refresh it
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-        }
-        if ($token_ok) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-            }
-        }
+		// Check if we have auth token and refresh it
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+		}
+		if ($token_ok) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+			}
+		}
 
-        // Send a request with api
-        $response = json_decode($apiService->request(self::PRINT_URL, 'POST', $post_fields), true);
-        //print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
-        return array('status' => $response['success'], 'errorcode' => $response['errorCode'], 'errormessage' => $response['message']);
-    }
+		// Send a request with api
+		$response = json_decode($apiService->request(self::PRINT_URL, 'POST', $post_fields), true);
+		//print '<tr><td><pre>'.print_r($response, true).'</pre></td></tr>';
+		return array('status' => $response['success'], 'errorcode' => $response['errorCode'], 'errormessage' => $response['message']);
+	}
 
 
-    /**
-     *  List jobs print
-     *
-     *  @return  int                     0 if OK, >0 if KO
-     */
-    public function listJobs()
-    {
-        global $conf, $langs;
+	/**
+	 *  List jobs print
+	 *
+	 *  @return  int                     0 if OK, >0 if KO
+	 */
+	public function listJobs()
+	{
+		global $conf, $langs;
 
-        $error = 0;
-        $html = '';
-        // Token storage
-        $storage = new DoliStorage($this->db, $this->conf);
-        // Setup the credentials for the requests
-        $credentials = new Credentials(
-            $this->google_id,
-            $this->google_secret,
-            DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
-        );
-        $serviceFactory = new \OAuth\ServiceFactory();
-        $apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
-        // Check if we have auth token
-        $token_ok = true;
-        try {
-            $token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $token_ok = false;
-            $error++;
-        }
-        $expire = false;
-        // Is token expired or will token expire in the next 30 seconds
-        if ($token_ok) {
-            $expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
-        }
+		$error = 0;
+		$html = '';
+		// Token storage
+		$storage = new DoliStorage($this->db, $this->conf);
+		// Setup the credentials for the requests
+		$credentials = new Credentials(
+			$this->google_id,
+			$this->google_secret,
+			DOL_MAIN_URL_ROOT.'/core/modules/oauth/google_oauthcallback.php'
+		);
+		$serviceFactory = new \OAuth\ServiceFactory();
+		$apiService = $serviceFactory->createService($this->OAUTH_SERVICENAME_GOOGLE, $credentials, $storage, array());
+		// Check if we have auth token
+		$token_ok = true;
+		try {
+			$token = $storage->retrieveAccessToken($this->OAUTH_SERVICENAME_GOOGLE);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$token_ok = false;
+			$error++;
+		}
+		$expire = false;
+		// Is token expired or will token expire in the next 30 seconds
+		if ($token_ok) {
+			$expire = ($token->getEndOfLife() !== -9002 && $token->getEndOfLife() !== -9001 && time() > ($token->getEndOfLife() - 30));
+		}
 
-        // Token expired so we refresh it
-        if ($token_ok && $expire) {
-            try {
-                // il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
-                $refreshtoken = $token->getRefreshToken();
-                $token = $apiService->refreshAccessToken($token);
-                $token->setRefreshToken($refreshtoken);
-                $storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        // Getting Jobs
-        // Send a request with api
-        try {
-            $response = $apiService->request(self::PRINTERS_GET_JOBS);
-        } catch (Exception $e) {
-            $this->errors[] = $e->getMessage();
-            $error++;
-        }
-        $responsedata = json_decode($response, true);
-        //$html .= '<pre>'.print_r($responsedata,true).'</pre>';
-        $html .= '<div class="div-table-responsive">';
-        $html .= '<table width="100%" class="noborder">';
-        $html .= '<tr class="liste_titre">';
-        $html .= '<td>'.$langs->trans("Id").'</td>';
-        $html .= '<td>'.$langs->trans("Date").'</td>';
-        $html .= '<td>'.$langs->trans("Owner").'</td>';
-        $html .= '<td>'.$langs->trans("Printer").'</td>';
-        $html .= '<td>'.$langs->trans("Filename").'</td>';
-        $html .= '<td>'.$langs->trans("Status").'</td>';
-        $html .= '<td>'.$langs->trans("Cancel").'</td>';
-        $html .= '</tr>'."\n";
+		// Token expired so we refresh it
+		if ($token_ok && $expire) {
+			try {
+				// il faut sauvegarder le refresh token car google ne le donne qu'une seule fois
+				$refreshtoken = $token->getRefreshToken();
+				$token = $apiService->refreshAccessToken($token);
+				$token->setRefreshToken($refreshtoken);
+				$storage->storeAccessToken($this->OAUTH_SERVICENAME_GOOGLE, $token);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		// Getting Jobs
+		// Send a request with api
+		try {
+			$response = $apiService->request(self::PRINTERS_GET_JOBS);
+		} catch (Exception $e) {
+			$this->errors[] = $e->getMessage();
+			$error++;
+		}
+		$responsedata = json_decode($response, true);
+		//$html .= '<pre>'.print_r($responsedata,true).'</pre>';
+		$html .= '<div class="div-table-responsive">';
+		$html .= '<table width="100%" class="noborder">';
+		$html .= '<tr class="liste_titre">';
+		$html .= '<td>'.$langs->trans("Id").'</td>';
+		$html .= '<td>'.$langs->trans("Date").'</td>';
+		$html .= '<td>'.$langs->trans("Owner").'</td>';
+		$html .= '<td>'.$langs->trans("Printer").'</td>';
+		$html .= '<td>'.$langs->trans("Filename").'</td>';
+		$html .= '<td>'.$langs->trans("Status").'</td>';
+		$html .= '<td>'.$langs->trans("Cancel").'</td>';
+		$html .= '</tr>'."\n";
 
-        $jobs = $responsedata['jobs'];
-        //$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
-        if (is_array($jobs)) {
-            foreach ($jobs as $value) {
-                $html .= '<tr class="oddeven">';
-                $html .= '<td>'.$value['id'].'</td>';
-                $dates = dol_print_date((int) substr($value['createTime'], 0, 10), 'dayhour');
-                $html .= '<td>'.$dates.'</td>';
-                $html .= '<td>'.$value['ownerId'].'</td>';
-                $html .= '<td>'.$value['printerName'].'</td>';
-                $html .= '<td>'.$value['title'].'</td>';
-                $html .= '<td>'.$value['status'].'</td>';
-                $html .= '<td>&nbsp;</td>';
-                $html .= '</tr>';
-            }
-        } else {
-                $html .= '<tr class="oddeven">';
-                $html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
-                $html .= '</tr>';
-        }
-        $html .= '</table>';
-        $html .= '</div>';
+		$jobs = $responsedata['jobs'];
+		//$html .= '<pre>'.print_r($jobs['0'],true).'</pre>';
+		if (is_array($jobs)) {
+			foreach ($jobs as $value) {
+				$html .= '<tr class="oddeven">';
+				$html .= '<td>'.$value['id'].'</td>';
+				$dates = dol_print_date((int) substr($value['createTime'], 0, 10), 'dayhour');
+				$html .= '<td>'.$dates.'</td>';
+				$html .= '<td>'.$value['ownerId'].'</td>';
+				$html .= '<td>'.$value['printerName'].'</td>';
+				$html .= '<td>'.$value['title'].'</td>';
+				$html .= '<td>'.$value['status'].'</td>';
+				$html .= '<td>&nbsp;</td>';
+				$html .= '</tr>';
+			}
+		} else {
+				$html .= '<tr class="oddeven">';
+				$html .= '<td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td>';
+				$html .= '</tr>';
+		}
+		$html .= '</table>';
+		$html .= '</div>';
 
-        $this->resprint = $html;
+		$this->resprint = $html;
 
-        return $error;
-    }
+		return $error;
+	}
 }
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index c67789b1814..a74286e4cdc 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -173,8 +173,8 @@ class pdf_azur extends ModelePDFPropales
 			$this->posxqty = 135;
 			$this->posxunit = 151;
 		} else {
-			$this->posxtva = 110;
-			$this->posxup = 126;
+			$this->posxtva = 106;
+			$this->posxup = 122;
 			$this->posxqty = 145;
 			$this->posxunit = 162;
 		}
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 8563c845d2b..324f52c1ca0 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -57,7 +57,7 @@ class pdf_cyan extends ModelePDFPropales
 	public $description;
 
 	/**
-	 * @var string     Save the name of generated file as the main doc when generating a doc with this template
+	 * @var int    Save the name of generated file as the main doc when generating a doc with this template
 	 */
 	public $update_main_doc_field;
 
@@ -119,6 +119,11 @@ class pdf_cyan extends ModelePDFPropales
 	 */
 	public $emetteur;
 
+	/**
+	 * @var array of document table collumns
+	 */
+	public $cols;
+
 
 	/**
 	 *	Constructor
@@ -164,11 +169,13 @@ class pdf_cyan extends ModelePDFPropales
 		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 
 		// Define position of columns
-		$this->posxdesc = $this->marge_gauche + 1;
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
 
 
 		$this->tabTitleHeight = 5; // default height
 
+		//  Use new system for position of columns, view  $this->defineColumnField()
+
 		$this->tva = array();
 		$this->localtax1 = array();
 		$this->localtax2 = array();
@@ -197,7 +204,7 @@ class pdf_cyan extends ModelePDFPropales
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
 		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
-		// Load traductions files required by page
+		// Load translation files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
 
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -344,16 +351,16 @@ class pdf_cyan extends ModelePDFPropales
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-				// Does we have at least one line with discount $this->atleastonediscount
-				foreach ($object->lines as $line) {
-					if ($line->remise_percent) {
-						$this->atleastonediscount = true;
-						break;
+				// Set $this->atleastonediscount if you have at least one discount
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					if ($object->lines[$i]->remise_percent)
+					{
+						$this->atleastonediscount++;
 					}
 				}
 
 
-
 				// New page
 				$pdf->AddPage();
 				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
@@ -365,7 +372,7 @@ class pdf_cyan extends ModelePDFPropales
 				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 				//print $heightforinfotot + $heightforsignature + $heightforfreetext + $heightforfooter;exit;
 
-				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
@@ -397,7 +404,7 @@ class pdf_cyan extends ModelePDFPropales
 					}
 				}
 
-				// Affiche notes
+				// Displays notes
 				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
 				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE))
 				{
@@ -454,7 +461,7 @@ class pdf_cyan extends ModelePDFPropales
 					{
 						$pdf->rollbackTransaction(true);
 
-						// prepar pages to receive notes
+						// prepare pages to receive notes
 						while ($pagenb < $pageposafternote) {
 							$pdf->AddPage();
 							$pagenb++;
@@ -488,7 +495,7 @@ class pdf_cyan extends ModelePDFPropales
 						}
 
 
-						// apply note frame to previus pages
+						// apply note frame to previous pages
 						$i = $pageposbeforenote;
 						while ($i < $pageposafternote) {
 							$pdf->setPage($i);
@@ -544,10 +551,10 @@ class pdf_cyan extends ModelePDFPropales
 					$height_note = 0;
 				}
 
-				// Use new auto collum system
+				// Use new auto column system
 				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-				// Simulation de tableau pour connaitre la hauteur de la ligne de titre
+				// tab simulation to know line height
 				$pdf->startTransaction();
 				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 				$pdf->rollbackTransaction(true);
@@ -582,7 +589,6 @@ class pdf_cyan extends ModelePDFPropales
 						{
 							$pdf->AddPage('', '', true);
 							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-							//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 							$pdf->setPage($pageposbefore + 1);
 
 							$curY = $tab_top_newpage;
@@ -656,7 +662,7 @@ class pdf_cyan extends ModelePDFPropales
 						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
 					}
 
-					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
 
 					// VAT Rate
 					if ($this->getColumnStatus('vat'))
@@ -700,7 +706,7 @@ class pdf_cyan extends ModelePDFPropales
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
-					// Total HT line
+					// Total excl tax line (HT)
 					if ($this->getColumnStatus('totalexcltax'))
 					{
 						$total_excl_tax = pdf_getlinetotalexcltax($object, $i, $outputlangs, $hidedetails);
@@ -708,6 +714,14 @@ class pdf_cyan extends ModelePDFPropales
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
+					// Total with tax line (TTC)
+					if ($this->getColumnStatus('totalincltax'))
+					{
+						$total_incl_tax = pdf_getlinetotalwithtax($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'totalincltax', $total_incl_tax);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
 					// Extrafields
 					if (!empty($object->lines[$i]->array_options)) {
 						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
@@ -732,8 +746,7 @@ class pdf_cyan extends ModelePDFPropales
 					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
 
-
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
 					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
@@ -826,13 +839,13 @@ class pdf_cyan extends ModelePDFPropales
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforsignature - $heightforfooter + 1;
 				}
 
-				// Affiche zone infos
+				// Display infos area
 				$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-				// Affiche zone totaux
+				// Display total zone
 				$posy = $this->drawTotalTable($pdf, $object, 0, $bottomlasttab, $outputlangs);
 
-				// Affiche zone versements
+				// Display payment area
 				/*
 				if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
 				{
@@ -1121,10 +1134,10 @@ class pdf_cyan extends ModelePDFPropales
 			// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
 			{
-				if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER))
+				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER))
 				{
-					$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
-					if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+					if ($object->fk_bank > 0) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
 					$account = new Account($this->db);
 					$account->fetch($bankid);
 
@@ -1154,15 +1167,23 @@ class pdf_cyan extends ModelePDFPropales
 	 */
 	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-		global $conf, $mysoc;
+		global $conf, $mysoc, $hookmanager;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
+		$outputlangsbis = null;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+			$default_font_size--;
+		}
+
 		$tab2_top = $posy;
 		$tab2_hl = 4;
 		$pdf->SetFont('', '', $default_font_size - 1);
 
-		// Tableau total
+		// Total table
 		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
@@ -1173,13 +1194,6 @@ class pdf_cyan extends ModelePDFPropales
 		$useborder = 0;
 		$index = 0;
 
-		$outputlangsbis = null;
-		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-			$outputlangsbis = new Translate('', $conf);
-			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
-		}
-
 		// Total HT
 		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
@@ -1387,6 +1401,7 @@ class pdf_cyan extends ModelePDFPropales
 
 		if ($deja_regle > 0)
 		{
+			// Already paid + Deposits
 			$index++;
 
 			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1440,9 +1455,10 @@ class pdf_cyan extends ModelePDFPropales
 	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @param		string		$currency		Currency code
+	 *   @param		Translate	$outputlangsbis	Langs object bis
 	 *   @return	void
 	 */
-	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
 	{
 		global $conf;
 
@@ -1460,6 +1476,10 @@ class pdf_cyan extends ModelePDFPropales
 		if (empty($hidetop))
 		{
 			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
+			}
+
 			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 
@@ -1490,9 +1510,10 @@ class pdf_cyan extends ModelePDFPropales
 	 *  @param  Object		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @return	void
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
 	{
 		global $conf, $langs;
 
@@ -1512,8 +1533,10 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
+		$w = 100;
+
 		$posy = $this->marge_haute;
-		$posx = $this->page_largeur - $this->marge_droite - 100;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -1537,12 +1560,12 @@ class pdf_cyan extends ModelePDFPropales
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
 					$pdf->SetFont('', 'B', $default_font_size - 2);
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
-					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 				}
 			} else {
 				$text = $this->emetteur->name;
-				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			}
 		}
 
@@ -1550,7 +1573,7 @@ class pdf_cyan extends ModelePDFPropales
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
 		$title = $outputlangs->transnoentities("PdfCommercialProposalTitle");
-		$pdf->MultiCell(100, 4, $title, '', 'R');
+		$pdf->MultiCell($w, 4, $title, '', 'R');
 
 		$pdf->SetFont('', 'B', $default_font_size);
 
@@ -1567,7 +1590,7 @@ class pdf_cyan extends ModelePDFPropales
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE))
@@ -1597,7 +1620,7 @@ class pdf_cyan extends ModelePDFPropales
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->date, "day", false, $outputlangs, true), '', 'R');
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
@@ -1609,7 +1632,7 @@ class pdf_cyan extends ModelePDFPropales
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
 		}
 
 		// Get contact
@@ -1623,7 +1646,7 @@ class pdf_cyan extends ModelePDFPropales
 				$posy += 4;
 				$pdf->SetXY($posx, $posy);
 				$pdf->SetTextColor(0, 0, 60);
-				$pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
 			}
 		}
 
@@ -1632,7 +1655,7 @@ class pdf_cyan extends ModelePDFPropales
 		$top_shift = 0;
 		// Show list of linked objects
 		$current_y = $pdf->getY();
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
 		if ($current_y < $pdf->getY())
 		{
 			$top_shift = $pdf->getY() - $current_y;
@@ -1703,9 +1726,10 @@ class pdf_cyan extends ModelePDFPropales
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
 
 			// Show recipient
-			$widthrecbox = 100;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
 			if ($this->page_largeur < 210) $widthrecbox = 84; // To work with US executive format
-			$posy = 42 + $top_shift;
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
 			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
 			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
 
@@ -1719,7 +1743,7 @@ class pdf_cyan extends ModelePDFPropales
 			// Show recipient name
 			$pdf->SetXY($posx + 2, $posy + 3);
 			$pdf->SetFont('', 'B', $default_font_size);
-			$pdf->MultiCell($widthrecbox, 4, $carac_client_name, 0, 'L');
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
 
 			$posy = $pdf->getY();
 
@@ -1840,7 +1864,7 @@ class pdf_cyan extends ModelePDFPropales
 				'align' => 'L',
 				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
 				// 'label' => ' ', // the final label
-				'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
 			),
 			'content' => array(
 				'align' => 'L',
@@ -1848,6 +1872,7 @@ class pdf_cyan extends ModelePDFPropales
 			),
 		);
 
+		// Image of product
 		$rank = $rank + 10;
 		$this->cols['photo'] = array(
 			'rank' => $rank,
@@ -1939,13 +1964,24 @@ class pdf_cyan extends ModelePDFPropales
 		$this->cols['totalexcltax'] = array(
 			'rank' => $rank,
 			'width' => 26, // in mm
-			'status' => true,
+			'status' => empty($conf->global->PDF_PROPAL_HIDE_PRICE_EXCL_TAX) ? true : false,
 			'title' => array(
 				'textkey' => 'TotalHT'
 			),
 			'border-left' => true, // add left line separator
 		);
 
+		$rank = $rank + 1010; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalincltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => empty($conf->global->PDF_PROPAL_SHOW_PRICE_INCL_TAX) ? false : true,
+			'title' => array(
+				'textkey' => 'TotalTTC'
+			),
+			'border-left' => true, // add left line separator
+		);
+
 		// Add extrafields cols
 		if (!empty($object->lines)) {
 			$line = reset($object->lines);
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 80a222d9a6c..83733dc1d33 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -134,7 +134,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->name = "canelle";
 		$this->description = $langs->trans('SuppliersInvoiceModel');
 
-		// Dimension page
+		// Page dimensions
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
@@ -145,12 +145,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
 
 		// Define column position
 		$this->posxdesc = $this->marge_gauche + 1;
@@ -489,7 +489,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 					$pdf->SetXY($this->postotalht, $curY);
 					$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 3, $total_excl_tax, 0, 'R', 0);
 
-					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					// Collection of totals by VAT value in $this->tva["taux"]=total_tva
 					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
 					else $tvaligne = $object->lines[$i]->total_tva;
 
@@ -668,7 +668,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->atleastoneratenotnull = 0;
 		foreach ($this->tva as $tvakey => $tvaval)
 		{
-			if ($tvakey > 0)    // On affiche pas taux 0
+			if ($tvakey > 0)    // We do not display rate 0
 			{
 				$this->atleastoneratenotnull++;
 
@@ -1209,7 +1209,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 			}
 
 			//Recipient name
-			// On peut utiliser le nom de la societe du contact
+			// We can use the name of the contact's company
 			if ($usecontact && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) {
 				$thirdparty = $object->contact;
 			} else {
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
index b96f2f83a76..f6e27499dc2 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -142,13 +142,13 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
-		$this->option_modereg = 1; // Affiche mode reglement
-		$this->option_condreg = 1; // Affiche conditions reglement
-		$this->option_codeproduitservice = 1; // Affiche code produit-service
-		$this->option_multilang = 1; // Dispo en plusieurs langues
-		$this->option_escompte = 0; // Affiche si il y a eu escompte
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
diff --git a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
index adccb15892b..388ee06f7a9 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -139,8 +139,8 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1; // Affiche logo
-		$this->option_multilang = 1; // Dispo en plusieurs langues
+		$this->option_logo = 1; // Display logo
+		$this->option_multilang = 1; // Available in several languages
 
 		// Define column position
 		$this->posxdate = $this->marge_gauche + 1;
@@ -168,7 +168,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$this->atleastoneratenotnull = 0;
 		$this->atleastonediscount = 0;
 
-		// 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
 	}
@@ -462,13 +462,13 @@ class pdf_standard extends ModelePDFSuppliersPayments
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
-				// Affiche zone cheèque
+				// Display check zone
 				$posy = $this->_tableau_cheque($pdf, $object, $bottomlasttab, $outputlangs);
 
 				// Affiche zone totaux
 				//$posy=$this->_tableau_tot($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-				// Pied de page
+				// Footer page
 				$this->_pagefoot($pdf, $object, $outputlangs);
 				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
diff --git a/htdocs/core/tpl/bloc_comment.tpl.php b/htdocs/core/tpl/bloc_comment.tpl.php
index edb675e45d6..e78a5a7734e 100644
--- a/htdocs/core/tpl/bloc_comment.tpl.php
+++ b/htdocs/core/tpl/bloc_comment.tpl.php
@@ -38,21 +38,21 @@ print "</tr>\n";
 
 if ($action !== 'editcomment')
 {
-    print '<tr class="oddeven">';
+	print '<tr class="oddeven">';
 
-    // Description
-    print '<td colspan="3">';
+	// Description
+	print '<td colspan="3">';
 
-    $desc = GETPOST('comment_description');
+	$desc = GETPOST('comment_description');
 
-    $doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
-    print $doleditor->Create(1);
+	$doleditor = new DolEditor('comment_description', $desc, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
+	print $doleditor->Create(1);
 
-    print '</td>';
+	print '</td>';
 
-    print '<td class="center">';
-    print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
-    print '</td></tr>';
+	print '<td class="center">';
+	print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
+	print '</td></tr>';
 }
 
 print '</table></form>';
@@ -96,47 +96,47 @@ if (!empty($object->comments))
 		print '<div class="comment-cell comment-right">';
 		print '<div class="comment-table width100p">';
 
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';
-            print '<input type="hidden" name="token" value="'.newToken().'">';
-            print '<input type="hidden" name="action" value="updatecomment">';
-            print '<input type="hidden" name="id" value="'.$object->id.'">';
-            print '<input type="hidden" name="idcomment" value="'.$idcomment.'">';
-            print '<input type="hidden" name="withproject" value="'.$withproject.'">';
-        }
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			print '<form method="POST" action="'.$varpage.'?id='.$object->id.'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="updatecomment">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print '<input type="hidden" name="idcomment" value="'.$idcomment.'">';
+			print '<input type="hidden" name="withproject" value="'.$withproject.'">';
+		}
 
-        print '<div class="comment-description comment-cell">';
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            $doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
-            print $doleditor->Create(1);
-        } else {
-            print $comment->description;
-        }
+		print '<div class="comment-description comment-cell">';
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			$doleditor = new DolEditor('comment_description', $comment->description, '', 80, 'dolibarr_notes', 'In', 0, true, true, ROWS_3, '100%');
+			print $doleditor->Create(1);
+		} else {
+			print $comment->description;
+		}
 		print '</div>'; // End comment-description
 
-        if ($action === 'editcomment' && $comment->id == $idcomment)
-        {
-            print '<input name="update" type="submit" class="button" value="'.$langs->trans("Update").'">';
-            print '<input name="cancel" type="submit" class="button" value="'.$langs->trans("Cancel").'">';
+		if ($action === 'editcomment' && $comment->id == $idcomment)
+		{
+			print '<input name="update" type="submit" class="button" value="'.$langs->trans("Update").'">';
+			print '<input name="cancel" type="submit" class="button" value="'.$langs->trans("Cancel").'">';
 
-            print '</form>';
-        } else {
-            if ($fk_user == $user->id || $user->admin == 1)
-            {
-                print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
-                print img_picto('', 'edit.png');
-                print '</a>';
-            }
-            if (($first && $fk_user == $user->id) || $user->admin == 1) {
-                print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
-                print img_picto('', 'delete.png');
-                print '</a>';
-            }
-        }
+			print '</form>';
+		} else {
+			if ($fk_user == $user->id || $user->admin == 1)
+			{
+				print '<a class="comment-edit comment-cell" href="'.$varpage.'?action=editcomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'#comment" title="'.$langs->trans('Edit').'">';
+				print img_picto('', 'edit.png');
+				print '</a>';
+			}
+			if (($first && $fk_user == $user->id) || $user->admin == 1) {
+				print '<a class="comment-delete comment-cell" href="'.$varpage.'?action=deletecomment&token='.newToken().'&id='.$id.'&withproject=1&idcomment='.$comment->id.'" title="'.$langs->trans('Delete').'">';
+				print img_picto('', 'delete.png');
+				print '</a>';
+			}
+		}
 
-        print '</div>'; // End comment-table
+		print '</div>'; // End comment-table
 		print '</div>'; // End comment-right
 		print '</div>'; // End comment
 
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index b980ca40cef..43ddd86fb99 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -74,18 +74,18 @@ print '<div class="inline-block toolbarbutton centpercent">';
 // Toolbar
 if ($permtoadd)
 {
-	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
+	print '<a href="'.DOL_URL_ROOT.'/ecm/dir_add_card.php?action=create&module='.urlencode($module).($websitekey ? '&website='.$websitekey : '').($pageid ? '&pageid='.$pageid : '').'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?file_manager=1&website='.$websitekey.'&pageid='.$pageid).'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ECMAddSection')).'">';
     print '<img class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
 } else {
-    print '<a href="#" class="inline-block valignmiddle toolbarbutton" title="'.$langs->trans("NotAllowed").'">';
+    print '<a href="#" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.$langs->trans("NotAllowed").'">';
     print '<img class="toolbarbutton disabled" border="0" src="'.DOL_URL_ROOT.'/theme/common/folder-new.png">';
     print '</a>';
 }
 if ($module == 'ecm')
 {
 	$tmpurl = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
-	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
+	print '<a href="'.$tmpurl.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('ReSyncListOfDir')).'">';
 	print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
 	print '</a>';
 }
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index bf5b87d0037..61be629b2ae 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -312,20 +312,22 @@ if (! empty($usemargins) && $user->rights->margins->creer)
 	?>
 	/* Some js test when we click on button "Add" */
 	jQuery(document).ready(function() {
-		<?php
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) { ?>
+	<?php
+	if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+		?>
 			$("input[name='np_marginRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_marginRate");
 			});
-			<?php
-		}
-		if (! empty($conf->global->DISPLAY_MARK_RATES)) { ?>
+		<?php
+	}
+	if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+		?>
 			$("input[name='np_markRate']:first").blur(function(e) {
 				return checkFreeLine(e, "np_markRate");
 			});
-			<?php
-		}
-		?>
+		<?php
+	}
+	?>
 	});
 
 	/* TODO This does not work for number with thousand separator that is , */
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 386bedad910..15637dc4a61 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -809,7 +809,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 		}
 
-		$object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
+		$object->actionmsg = dol_concatdesc($langs->transnoentities("Author").': '.$user->login, $object->actionmsg);
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 10a2659f6a5..c5acbcf16bd 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -1285,9 +1285,9 @@ class Cronjob extends CommonObject
 			elseif ($lastresult) $moretext .= ' ('.$langs->trans("Error").')';
 
 			$this->labelStatus[self::STATUS_DISABLED] = $langs->trans('Disabled').$moretext;
-			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Enabled').$moretext;
+			$this->labelStatus[self::STATUS_ENABLED] = $langs->trans('Scheduled').$moretext;
 			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->trans('Disabled');
-			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->trans('Scheduled');
 		}
 
 		$statusType = 'status4';
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 927c1d1014f..cea8ce39016 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -372,7 +372,7 @@ print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre" align="center">';
-print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Enabled")), $search_status, 1);
+print $form->selectarray('search_status', array('0'=>$langs->trans("Disabled"), '1'=>$langs->trans("Scheduled")), $search_status, 1);
 print '</td><td class="liste_titre right">';
 $searchpicto = $form->showFilterButtons();
 print $searchpicto;
diff --git a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
index b6525633481..6ec58ea6720 100644
--- a/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolMemoryCollector.php
@@ -15,13 +15,13 @@ class DolMemoryCollector extends MemoryCollector
      */
     public function collect()
     {
-        global $langs;
+        global $conf, $langs;
 
         $this->updatePeakUsage();
         return array(
             'peak_usage' => $this->peakUsage,
             //'peak_usage_str' => $this->getDataFormatter()->formatBytes($this->peakUsage, 2)
-            'peak_usage_str' => $this->peakUsage.' '.$langs->trans("bytes")
+        	'peak_usage_str' => (empty($conf->dol_optimize_smallscreen) ? dol_print_size($this->peakUsage, 0) : dol_print_size($this->peakUsage, 1))
         );
     }
 
diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index a03575f88e8..b1b31bc9154 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -59,14 +59,19 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 	protected function getDolibarrInfo()
 	{
 		global $conf, $langs;
+		global $dolibarr_main_prod, $dolibarr_nocsrfcheck;
 
 		$info  = $langs->trans('Version').': <strong>'.DOL_VERSION.'</strong><br>';
 		$info .= $langs->trans('Theme').': <strong>'.$conf->theme.'</strong><br>';
 		$info .= $langs->trans('Locale').': <strong>'.$conf->global->MAIN_LANG_DEFAULT.'</strong><br>';
 		$info .= $langs->trans('Currency').': <strong>'.$conf->currency.'</strong><br>';
-		$info .= $langs->trans('DolEntity').': <strong>'.$conf->entity.'</strong><br>';
-		$info .= $langs->trans('ListLimit').': <strong>'.($conf->liste_limit ?: $conf->global->MAIN_SIZE_LISTE_LIMIT).'</strong><br>';
-		$info .= $langs->trans('MaxSizeForUploadedFiles').': <strong>'.$conf->global->MAIN_UPLOAD_DOC.'</strong>';
+		$info .= $langs->trans('Entity').': <strong>'.$conf->entity.'</strong><br>';
+		$info .= $langs->trans('MaxSizeList').': <strong>'.($conf->liste_limit ?: $conf->global->MAIN_SIZE_LISTE_LIMIT).'</strong><br>';
+		$info .= $langs->trans('MaxSizeForUploadedFiles').': <strong>'.$conf->global->MAIN_UPLOAD_DOC.'</strong><br>';
+		$info .= '$dolibarr_main_prod = <strong>'.$dolibarr_main_prod.'</strong><br>';
+		$info .= '$dolibarr_nocsrfcheck = <strong>'.$dolibarr_nocsrfcheck.'</strong><br>';
+		$info .= 'MAIN_SECURITY_CSRF_WITH_TOKEN = <strong>'.$conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN.'</strong><br>';
+		$info .= 'MAIN_FEATURES_LEVEL = <strong>'.$conf->global->MAIN_FEATURES_LEVEL.'</strong><br>';
 
 		return $info;
 	}
@@ -79,6 +84,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 	protected function getMailInfo()
 	{
 		global $conf, $langs;
+		global $dolibarr_mailing_limit_sendbyweb;
 
 		$info  = $langs->trans('Method').': <strong>'.$conf->global->MAIN_MAIL_SENDMODE.'</strong><br>';
 		$info .= $langs->trans('Server').': <strong>'.$conf->global->MAIN_MAIL_SMTP_SERVER.'</strong><br>';
@@ -86,7 +92,8 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		$info .= $langs->trans('ID').': <strong>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</strong><br>';
 		$info .= $langs->trans('Pwd').': <strong>'.preg_replace('/./', '*', $conf->global->MAIN_MAIL_SMTPS_PW).'</strong><br>';
 		$info .= $langs->trans('TLS/STARTTLS').': <strong>'.$conf->global->MAIN_MAIL_EMAIL_TLS.'</strong> / <strong>'.$conf->global->MAIN_MAIL_EMAIL_STARTTLS.'</strong><br>';
-		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.($conf->global->MAIN_DISABLE_ALL_MAILS ? $langs->trans('Yes') : $langs->trans('No')).'</strong>';
+		$info .= $langs->trans('MAIN_DISABLE_ALL_MAILS').': <strong>'.($conf->global->MAIN_DISABLE_ALL_MAILS ? $langs->trans('Yes') : $langs->trans('No')).'</strong><br>';
+		$info .= 'dolibarr_mailing_limit_sendbyweb = <strong>'.$dolibarr_mailing_limit_sendbyweb.'</strong><br>';
 
 		return $info;
 	}
diff --git a/htdocs/document.php b/htdocs/document.php
index bc0cc1eb933..a608dfe820e 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -173,7 +173,7 @@ $refname = basename(dirname($original_file)."/");
 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');
 
 // Check security and set return info with full path of file
-$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $user, $refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 3ccaa573e8c..b9ec7ebcaa7 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -167,14 +167,14 @@ class Don extends CommonObject
 		{
 			global $langs;
 			$langs->load("donations");
-			$this->labelStatus[-1] = $langs->trans("Canceled");
-			$this->labelStatus[0] = $langs->trans("DonationStatusPromiseNotValidated");
-			$this->labelStatus[1] = $langs->trans("DonationStatusPromiseValidated");
-			$this->labelStatus[2] = $langs->trans("DonationStatusPaid");
-			$this->labelStatusShort[-1] = $langs->trans("Canceled");
-			$this->labelStatusShort[0] = $langs->trans("DonationStatusPromiseNotValidatedShort");
-			$this->labelStatusShort[1] = $langs->trans("DonationStatusPromiseValidatedShort");
-			$this->labelStatusShort[2] = $langs->trans("DonationStatusPaidShort");
+			$this->labelStatus[-1] = $langs->transnoentitiesnoconv("Canceled");
+			$this->labelStatus[0] = $langs->transnoentitiesnoconv("DonationStatusPromiseNotValidated");
+			$this->labelStatus[1] = $langs->transnoentitiesnoconv("DonationStatusPromiseValidated");
+			$this->labelStatus[2] = $langs->transnoentitiesnoconv("DonationStatusPaid");
+			$this->labelStatusShort[-1] = $langs->transnoentitiesnoconv("Canceled");
+			$this->labelStatusShort[0] = $langs->transnoentitiesnoconv("DonationStatusPromiseNotValidatedShort");
+			$this->labelStatusShort[1] = $langs->transnoentitiesnoconv("DonationStatusPromiseValidatedShort");
+			$this->labelStatusShort[2] = $langs->transnoentitiesnoconv("DonationStatusPaidShort");
 		}
 
 		$statusType = 'status'.$status;
diff --git a/htdocs/don/payment/card.php b/htdocs/don/payment/card.php
index 26f540969ee..d3ecbe2a107 100644
--- a/htdocs/don/payment/card.php
+++ b/htdocs/don/payment/card.php
@@ -69,42 +69,6 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->don->supp
 	}
 }
 
-// Create payment
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->don->creer)
-{
-	$db->begin();
-
-	$result = $object->valide();
-
-	if ($result > 0)
-	{
-		$db->commit();
-
-		$donations = array(); // TODO Get all id of donation linked to this payment
-		foreach ($donations as $id)
-		{
-			$donation = new Don($db);
-			$donation->fetch($id);
-
-			$outputlangs = $langs;
-			if (!empty(GETPOST('lang_id')))
-			{
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang(GETPOST('lang_id'));
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$donation->generateDocument($donation->model_pdf, $outputlangs);
-			}
-		}
-
-		header('Location: card.php?id='.$object->id);
-		exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-		$db->rollback();
-	}
-}
-
 
 /*
  * View
@@ -132,14 +96,6 @@ if ($action == 'delete')
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-/*
- * Confirm validation of the payment
- */
-if ($action == 'valide')
-{
-	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
-}
-
 
 dol_banner_tab($object, 'id', '', 1, 'rowid', 'id');
 
@@ -148,13 +104,6 @@ print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border centpercent">';
 
-// Ref
-/*print '<tr><td class=">'.$langs->trans('Ref').'</td>';
-print '<td colspan="3">';
-print $form->showrefnav($object,'id','',1,'rowid','id');
-print '</td></tr>';
-*/
-
 // Date
 print '<tr><td class="titlefield">'.$langs->trans('Date').'</td><td>'.dol_print_date($object->datep, 'day').'</td></tr>';
 
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index 3983765d904..1a50677f51a 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -177,6 +177,19 @@ if ($action == 'create')
 
 	print load_fiche_titre($langs->trans("DoPayment"));
 
+	if (!empty($conf->use_javascript_ajax))
+	{
+		print "\n".'<script type="text/javascript" language="javascript">';
+		//Add js for AutoFill
+		print ' $(document).ready(function () {';
+		print ' 	$(".AutoFillAmout").on(\'click touchstart\', function(){
+							$("input[name="+$(this).data(\'rowname\')+"]").val($(this).data("value")).trigger("change");
+						});';
+		print '	});'."\n";
+
+		print '	</script>'."\n";
+	}
+
 	print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="rowid" value="'.$chid.'">';
@@ -257,6 +270,8 @@ if ($action == 'create')
 		if ($sumpaid < $objp->amount)
 		{
 			$namef = "amount_".$objp->id;
+			if (!empty($conf->use_javascript_ajax))
+				print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".price($objp->amount - $sumpaid)."'");
 			print '<input type="text" size="8" name="'.$namef.'">';
 		} else {
 			print '-';
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 25673c65c6c..dc39550c0cf 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -35,7 +35,7 @@ class EcmDirectory extends CommonObject
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element='ecm_directories';
+	public $table_element = 'ecm_directories';
 
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 483335093e9..d5a66ca4134 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -44,8 +44,8 @@ $socid = GETPOST("socid", "int");
 // Security check
 if ($user->socid > 0)
 {
-    $action = '';
-    $socid = $user->socid;
+	$action = '';
+	$socid = $user->socid;
 }
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -62,14 +62,14 @@ if (!$sortfield) $sortfield = "label";
 $section = GETPOST("section", 'alpha');
 if (!$section)
 {
-    dol_print_error('', 'Error, section parameter missing');
-    exit;
+	dol_print_error('', 'Error, section parameter missing');
+	exit;
 }
 $urlfile = GETPOST("urlfile");
 if (!$urlfile)
 {
-    dol_print_error('', "ErrorParamNotDefined");
-    exit;
+	dol_print_error('', "ErrorParamNotDefined");
+	exit;
 }
 
 // Load ecm object
@@ -77,8 +77,8 @@ $ecmdir = new EcmDirectory($db);
 $result = $ecmdir->fetch(GETPOST("section", 'alpha'));
 if (!$result > 0)
 {
-    dol_print_error($db, $ecmdir->error);
-    exit;
+	dol_print_error($db, $ecmdir->error);
+	exit;
 }
 $relativepath = $ecmdir->getRelativePath();
 $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
@@ -114,67 +114,67 @@ if ($result < 0)
 
 if ($cancel)
 {
-    $action = '';
-    if ($backtopage)
-    {
-        header("Location: ".$backtopage);
-        exit;
-    } else {
-    	header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
-        exit;
-    }
+	$action = '';
+	if ($backtopage)
+	{
+		header("Location: ".$backtopage);
+		exit;
+	} else {
+		header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section).($module ? '&module='.urlencode($module) : ''));
+		exit;
+	}
 }
 
 // Rename file
 if ($action == 'update')
 {
-    $error = 0;
+	$error = 0;
 
-    $oldlabel = GETPOST('urlfile', 'alpha');
-    $newlabel = dol_sanitizeFileName(GETPOST('label', 'alpha'));
+	$oldlabel = GETPOST('urlfile', 'alpha');
+	$newlabel = dol_sanitizeFileName(GETPOST('label', 'alpha'));
 	$shareenabled = GETPOST('shareenabled', 'alpha');
 
-    //$db->begin();
+	//$db->begin();
 
-    $olddir = $ecmdir->getRelativePath(0); // Relative to ecm
-    $olddirrelativetodocument = 'ecm/'.$olddir; // Relative to document
-    $newdirrelativetodocument = 'ecm/'.$olddir;
-    $olddir = $conf->ecm->dir_output.'/'.$olddir;
-    $newdir = $olddir;
+	$olddir = $ecmdir->getRelativePath(0); // Relative to ecm
+	$olddirrelativetodocument = 'ecm/'.$olddir; // Relative to document
+	$newdirrelativetodocument = 'ecm/'.$olddir;
+	$olddir = $conf->ecm->dir_output.'/'.$olddir;
+	$newdir = $olddir;
 
-    $oldfile = $olddir.$oldlabel;
-    $newfile = $newdir.$newlabel;
-    $newfileformove = $newfile;
-    // If old file end with .noexe, new file must also end with .noexe
-    if (preg_match('/\.noexe$/', $oldfile) && ! preg_match('/\.noexe$/', $newfileformove)) {
-    	$newfileformove .= '.noexe';
-    }
-    //var_dump($oldfile);var_dump($newfile);exit;
+	$oldfile = $olddir.$oldlabel;
+	$newfile = $newdir.$newlabel;
+	$newfileformove = $newfile;
+	// If old file end with .noexe, new file must also end with .noexe
+	if (preg_match('/\.noexe$/', $oldfile) && ! preg_match('/\.noexe$/', $newfileformove)) {
+		$newfileformove .= '.noexe';
+	}
+	//var_dump($oldfile);var_dump($newfile);exit;
 
-    // Now we update index of file
-    $db->begin();
-    //print $oldfile.' - '.$newfile;
-    if ($newlabel != $oldlabel)
-    {
-    	$result = dol_move($oldfile, $newfileformove); // This include update of database
-        if (!$result)
-        {
-            $langs->load('errors');
-            setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
-            $error++;
-        }
+	// Now we update index of file
+	$db->begin();
+	//print $oldfile.' - '.$newfile;
+	if ($newlabel != $oldlabel)
+	{
+		$result = dol_move($oldfile, $newfileformove); // This include update of database
+		if (!$result)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans('ErrorFailToRenameFile', $oldfile, $newfile), null, 'errors');
+			$error++;
+		}
 
-        // Reload object after the move
-        $result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
-        if ($result < 0)
-        {
-        	dol_print_error($db, $object->error, $object->errors);
-        	exit;
-        }
-    }
+		// Reload object after the move
+		$result = $object->fetch(0, '', $newdirrelativetodocument.$newlabel);
+		if ($result < 0)
+		{
+			dol_print_error($db, $object->error, $object->errors);
+			exit;
+		}
+	}
 
-    if (!$error)
-    {
+	if (!$error)
+	{
 		if ($shareenabled)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -217,23 +217,23 @@ if ($action == 'update')
 				setEventMessages($object->error, $object->errors, 'warnings');
 			}
 		}
-    }
+	}
 
-    if (!$error)
-    {
-        $db->commit();
+	if (!$error)
+	{
+		$db->commit();
 
-        $urlfile = $newlabel;
-        // If old file end with .noexe, new file must also end with .noexe
-        if (preg_match('/\.noexe$/', $newfileformove)) {
-        	$urlfile .= '.noexe';
-        }
+		$urlfile = $newlabel;
+		// If old file end with .noexe, new file must also end with .noexe
+		if (preg_match('/\.noexe$/', $newfileformove)) {
+			$urlfile .= '.noexe';
+		}
 
-        header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
-        exit;
-    } else {
-        $db->rollback();
-    }
+		header('Location: '.$_SERVER["PHP_SELF"].'?urlfile='.urlencode($urlfile).'&section='.urlencode($section));
+		exit;
+	} else {
+		$db->rollback();
+	}
 }
 
 
@@ -381,7 +381,7 @@ if (!empty($object->share))
 }
 print '</td>';
 print '</tr>';
-print $object->showOptionals($extrafields, ($action == 'edit'?'edit':'view'));
+print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view'));
 print '</table>';
 print '</div>';
 
@@ -392,20 +392,20 @@ dol_fiche_end();
 
 if ($action == 'edit')
 {
-    print '<div class="center">';
-    print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
-    print ' &nbsp; &nbsp; ';
-    print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
+	print '<div class="center">';
+	print '<input type="submit" class="button" name="submit" value="'.$langs->trans("Save").'">';
+	print ' &nbsp; &nbsp; ';
+	print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
 
-    print '</form>';
+	print '</form>';
 }
 
 
 // Confirmation de la suppression d'une ligne categorie
 if ($action == 'delete_file')
 {
-    print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?section='.urlencode($section), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', $urlfile), 'confirm_deletefile', '', 1, 1);
 }
 
 if ($action != 'edit')
@@ -413,11 +413,11 @@ if ($action != 'edit')
 	// Actions buttons
 	print '<div class="tabsAction">';
 
-    if ($user->rights->ecm->setup)
-    {
-        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
-    }
-    /*
+	if ($user->rights->ecm->setup)
+	{
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&section='.urlencode($section).'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Edit').'</a>';
+	}
+	/*
 	if ($user->rights->ecm->setup)
 	{
 		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=delete_file&token='.newToken().'&section='.$section.'&urlfile='.urlencode($urlfile).'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 05d454b8198..e8bf1465fb5 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -352,7 +352,7 @@ print '<div class="inline-block toolbarbutton centpercent">';
 
 // Toolbar
 $url = ((!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) ? '#' : ($_SERVER["PHP_SELF"].'?action=refreshmanual'.($module ? '&amp;module='.$module : '').($section ? '&amp;section='.$section : '')));
-print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
+print '<a href="'.$url.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans('Refresh')).'">';
 print '<img id="refreshbutton" class="toolbarbutton" border="0" src="'.DOL_URL_ROOT.'/theme/common/view-refresh.png">';
 print '</a>';
 
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 9b6a07a5435..bdf79081fe2 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -11,7 +11,7 @@
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
  * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -82,6 +82,13 @@ class Expedition extends CommonObject
 
 	public $socid;
 
+	/**
+	 * @var string Customer ref
+	 * @deprecated
+	 * @see $ref_customer
+	 */
+	public $ref_client;
+
 	/**
 	 * @var string Customer ref
 	 */
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 3f9de5533fc..37bee98d73f 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -408,7 +408,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -417,7 +417,7 @@ if ($resql)
 		$moreforfilter .= $form->selectarray('search_product_category', $cate_arbo, $search_product_category, 1, 0, 0, '', 0, 0, 0, 0, 'maxwidth300', 1);
 		$moreforfilter .= '</div>';
 	}
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 2e826cb4080..4579c1a3e8f 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -214,6 +214,8 @@ if (empty($reshook))
 
 	if ($action == 'add' && $user->rights->expensereport->creer)
 	{
+		$error = 0;
+
 		$object = new ExpenseReport($db);
 
 		$object->date_debut = $date_start;
@@ -222,6 +224,19 @@ if (empty($reshook))
 		$object->fk_user_author = GETPOST('fk_user_author', 'int');
 		if (!($object->fk_user_author > 0)) $object->fk_user_author = $user->id;
 
+		// Check that expense report is for a user inside the hierarchy or advanced permission for all is set
+		if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
+			$error++;
+			setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
+		} else {
+			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
+				if (! in_array($object->fk_user_author, $childids)) {
+					$error++;
+					setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+				}
+			}
+		}
+
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 
@@ -1354,6 +1369,7 @@ if (empty($reshook))
 
 $title = $langs->trans("ExpenseReport")." - ".$langs->trans("Card");
 $helpurl = "EN:Module_Expense_Reports";
+
 llxHeader("", $title, $helpurl);
 
 $form = new Form($db);
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index b32e95597e8..f020680c110 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2015 		Alexandre Spangaro  	<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (c) 2018       Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2016-2018 	Ferran Marcet       	<fmarcet@2byte.es>
+ * Copyright (C) 2016-2020 	Ferran Marcet       	<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -405,7 +405,7 @@ class ExpenseReport extends CommonObject
 		$this->id = 0;
 		$this->ref = '';
 		$this->status = 0;
-		$this->fk_statut = 0;	// deprecated
+		$this->fk_statut = 0; // deprecated
 
 		// Clear fields
 		$this->fk_user_author     = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
@@ -601,7 +601,7 @@ class ExpenseReport extends CommonObject
 					$this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
 				}
 
-				$this->lines = array();
+				$this->fetch_optionals();
 
 				$result = $this->fetch_lines();
 
@@ -1353,7 +1353,7 @@ class ExpenseReport extends CommonObject
 			$sql .= ' WHERE rowid = '.$this->id;
 			if ($this->db->query($sql))
 			{
-				$this->fk_statut = 99;	// deprecated
+				$this->fk_statut = 99; // deprecated
 				$this->status = 99;
 				$this->fk_user_refuse = $fuser->id;
 				$this->detail_refuse = $details;
diff --git a/htdocs/expensereport/payment/card.php b/htdocs/expensereport/payment/card.php
index 9bc50341973..718e96b12b0 100644
--- a/htdocs/expensereport/payment/card.php
+++ b/htdocs/expensereport/payment/card.php
@@ -70,42 +70,6 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expensere
 	}
 }
 
-// Create payment
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->expensereport->creer)
-{
-	$db->begin();
-
-	$result = $object->valide();
-
-	if ($result > 0)
-	{
-		$db->commit();
-
-		$factures = array(); // TODO Get all id of invoices linked to this payment
-		foreach ($factures as $invoiceid)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($invoiceid);
-
-			$outputlangs = $langs;
-			if (!empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->model_pdf, $outputlangs);
-			}
-		}
-
-		header('Location: card.php?id='.$object->id);
-		exit;
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-		$db->rollback();
-	}
-}
-
 
 /*
  * View
@@ -127,15 +91,6 @@ if ($action == 'delete')
 	print $form->formconfirm('card.php?id='.$object->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-/*
- * Confirm validation of the payment
- */
-if ($action == 'valide')
-{
-	$facid = $_GET['facid'];
-	print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
-}
-
 $linkback = '';
 // $linkback = '<a href="' . DOL_URL_ROOT . '/expensereport/payment/list.php">' . $langs->trans("BackToList") . '</a>';
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index 70e04d46cbb..d7075d86e1b 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -459,7 +459,7 @@ if ($step == 1 || !$datatoexport)
             print '</td><td class="right">';
             if ($objexport->array_export_perms[$key])
             {
-            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'filenew').'</a>';
+            	print '<a href="'.DOL_URL_ROOT.'/exports/export.php?step=2&module_position='.$objexport->array_export_module[$key]->module_position.'&datatoexport='.$objexport->array_export_code[$key].'">'.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15x"').'</a>';
             } else {
             	print $langs->trans("NotEnoughPermissions");
             }
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index 650fdc2be15..e4afe4b0452 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -202,16 +202,16 @@ if (empty($reshook))
 		}
 	} elseif ($action == 'add' && $user->rights->ficheinter->creer)
 	{
-	    $object->socid = $socid;
-	    $object->duration = GETPOST('duration', 'int');
-	    $object->fk_project		= GETPOST('projectid', 'int');
-	    $object->fk_contrat		= GETPOST('contratid', 'int');
-	    $object->author = $user->id;
-	    $object->description	= GETPOST('description', 'restricthtml');
-	    $object->ref = $ref;
-	    $object->model_pdf = GETPOST('model', 'alpha');
-	    $object->note_private = GETPOST('note_private', 'restricthtml');
-	    $object->note_public = GETPOST('note_public', 'restricthtml');
+		$object->socid = $socid;
+		$object->duration = GETPOST('duration', 'int');
+		$object->fk_project		= GETPOST('projectid', 'int');
+		$object->fk_contrat		= GETPOST('contratid', 'int');
+		$object->author = $user->id;
+		$object->description	= GETPOST('description', 'restricthtml');
+		$object->ref = $ref;
+		$object->model_pdf = GETPOST('model', 'alpha');
+		$object->note_private = GETPOST('note_private', 'restricthtml');
+		$object->note_public = GETPOST('note_public', 'restricthtml');
 
 		if ($object->socid > 0)
 		{
@@ -251,7 +251,7 @@ if (empty($reshook))
 				$extrafields = new ExtraFields($db);
 				$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
-		        $object->array_options = $array_options;
+				$object->array_options = $array_options;
 
 				$id = $object->create($user);
 
@@ -356,12 +356,12 @@ if (empty($reshook))
 
 									$result = $object->addline(
 										$user,
-				                        $id,
-				                        $desc,
-							            $date_intervention,
-		                 				$duration,
-		                 				$array_options
-				                    );
+										$id,
+										$desc,
+										$date_intervention,
+						 				$duration,
+						 				$array_options
+									);
 
 									if ($result < 0)
 									{
@@ -371,44 +371,44 @@ if (empty($reshook))
 								}
 							}
 						}
-		            } else {
+					} else {
 						$mesg = $srcobject->error;
-		                $error++;
-		            }
-		        } else {
+						$error++;
+					}
+				} else {
 					$mesg = $object->error;
-		            $error++;
-		        }
-		    } else {
-		    	// Fill array 'array_options' with data from add form
-		    	$ret = $extrafields->setOptionalsFromPost(null, $object);
-		    	if ($ret < 0) {
-		    		$error++;
-		    		$action = 'create';
-		    	}
+					$error++;
+				}
+			} else {
+				// Fill array 'array_options' with data from add form
+				$ret = $extrafields->setOptionalsFromPost(null, $object);
+				if ($ret < 0) {
+					$error++;
+					$action = 'create';
+				}
 
-		    	if (!$error)
-		    	{
-		    		// Extrafields
-		    		$array_options = $extrafields->getOptionalsFromPost($object->table_element);
+				if (!$error)
+				{
+					// Extrafields
+					$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
-		    		$object->array_options = $array_options;
+					$object->array_options = $array_options;
 
-		    		$result = $object->create($user);
-		    		if ($result > 0)
-		    		{
-		    			$id = $result; // Force raffraichissement sur fiche venant d'etre cree
-		    		} else {
-		    			$langs->load("errors");
-		    			setEventMessages($object->error, $object->errors, 'errors');
-		    			$action = 'create';
-		    		}
-		    	}
-	        }
-	    } else {
+					$result = $object->create($user);
+					if ($result > 0)
+					{
+						$id = $result; // Force raffraichissement sur fiche venant d'etre cree
+					} else {
+						$langs->load("errors");
+						setEventMessages($object->error, $object->errors, 'errors');
+						$action = 'create';
+					}
+				}
+			}
+		} else {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty"));
-	        $action = 'create';
-	    }
+			$action = 'create';
+		}
 	} elseif ($action == 'update' && $user->rights->ficheinter->creer)
 	{
 		$object->socid = $socid;
@@ -482,14 +482,14 @@ if (empty($reshook))
 			$extrafields->fetch_name_optionals_label($object->table_element_line);
 			$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
 
-        	$result = $object->addline(
+			$result = $object->addline(
 				$user,
-	            $id,
-	            $desc,
-	            $date_intervention,
-	            $duration,
-	            $array_options
-	        );
+				$id,
+				$desc,
+				$date_intervention,
+				$duration,
+				$array_options
+			);
 
 			// Define output language
 			$outputlangs = $langs;
@@ -545,14 +545,14 @@ if (empty($reshook))
 	// Classify Done
 	elseif ($action == 'classifydone' && $user->rights->ficheinter->creer)
 	{
-	    $result = $object->setStatut(3);
-	    if ($result > 0)
-	    {
-	        header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-	        exit;
-	    } else {
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$result = $object->setStatut(3);
+		if ($result > 0)
+		{
+			header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
+			exit;
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	// Reopen
@@ -591,9 +591,9 @@ if (empty($reshook))
 		$date_inter = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
 		$duration = convertTime2Seconds(GETPOST('durationhour', 'int'), GETPOST('durationmin', 'int'));
 
-	    $objectline->datei = $date_inter;
-	    $objectline->desc = $desc;
-	    $objectline->duration = $duration;
+		$objectline->datei = $date_inter;
+		$objectline->desc = $desc;
+		$objectline->duration = $duration;
 
 		// Extrafields
 		$extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -601,11 +601,11 @@ if (empty($reshook))
 		$objectline->array_options = $array_options;
 
 		$result = $objectline->update($user);
-	    if ($result < 0)
-	    {
-	        dol_print_error($db);
-	        exit;
-	    }
+		if ($result < 0)
+		{
+			dol_print_error($db);
+			exit;
+		}
 
 		// Define output language
 		$outputlangs = $langs;
@@ -817,11 +817,11 @@ if ($action == 'create')
 			$subelement = $regs[2];
 		}
 
-        if ($element == 'project')
-        {
-            $projectid = GETPOST('originid', 'int');
-        } else {
-            // For compatibility
+		if ($element == 'project')
+		{
+			$projectid = GETPOST('originid', 'int');
+		} else {
+			// For compatibility
 			if ($element == 'order' || $element == 'commande') {
 				$element = $subelement = 'commande';
 			}
@@ -904,20 +904,20 @@ if ($action == 'create')
 
 			$langs->load("project");
 
-            print '<tr><td>'.$langs->trans("Project").'</td><td>';
-            /* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
+			print '<tr><td>'.$langs->trans("Project").'</td><td>';
+			/* Fix: If a project must be linked to any companies (suppliers or not), project must be not be set as limited to customer but must be not linked to any particular thirdparty
             if ($societe->fournisseur==1)
             	$numprojet=select_projects(-1,$_POST["projectid"],'projectid');
             else
             	$numprojet=select_projects($societe->id,$_POST["projectid"],'projectid');
             	*/
-            $numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid');
-            if ($numprojet == 0)
-            {
-                print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
-            }
-            print '</td></tr>';
-        }
+			$numprojet = $formproject->select_projects($soc->id, $projectid, 'projectid');
+			if ($numprojet == 0)
+			{
+				print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
+			}
+			print '</td></tr>';
+		}
 
 		// Contract
 		if ($conf->contrat->enabled)
@@ -932,53 +932,53 @@ if ($action == 'create')
 			print '</td></tr>';
 		}
 
-        // Model
-        print '<tr>';
-        print '<td>'.$langs->trans("DefaultModel").'</td>';
-        print '<td>';
-        $liste = ModelePDFFicheinter::liste_modeles($db);
-        print $form->selectarray('model', $liste, $conf->global->FICHEINTER_ADDON_PDF);
-        print "</td></tr>";
+		// Model
+		print '<tr>';
+		print '<td>'.$langs->trans("DefaultModel").'</td>';
+		print '<td>';
+		$liste = ModelePDFFicheinter::liste_modeles($db);
+		print $form->selectarray('model', $liste, $conf->global->FICHEINTER_ADDON_PDF);
+		print "</td></tr>";
 
-        // Public note
-        print '<tr>';
-        print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-        print '<td>';
-        $doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        print $doleditor->Create(1);
-        //print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
-        print '</td></tr>';
+		// Public note
+		print '<tr>';
+		print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
+		print '<td>';
+		$doleditor = new DolEditor('note_public', $note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+		print $doleditor->Create(1);
+		//print '<textarea name="note_public" cols="80" rows="'.ROWS_3.'">'.$note_public.'</textarea>';
+		print '</td></tr>';
 
-        // Private note
-        if (empty($user->socid))
-        {
-        	print '<tr>';
-        	print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-        	print '<td>';
-        	$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
-        	print $doleditor->Create(1);
-        	//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
-        	print '</td></tr>';
-        }
+		// Private note
+		if (empty($user->socid))
+		{
+			print '<tr>';
+			print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
+			print '<td>';
+			$doleditor = new DolEditor('note_private', $note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
+			print $doleditor->Create(1);
+			//print '<textarea name="note_private" cols="80" rows="'.ROWS_3.'">'.$note_private.'</textarea>';
+			print '</td></tr>';
+		}
 
-        // Other attributes
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
-        if (empty($reshook))
+		// Other attributes
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit');
 		}
 
-        // Show link to origin object
-        if (!empty($origin) && !empty($originid) && is_object($objectsrc))
-        {
-        	$newclassname = $classname;
-        	if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
-        	print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
+		// Show link to origin object
+		if (!empty($origin) && !empty($originid) && is_object($objectsrc))
+		{
+			$newclassname = $classname;
+			if ($newclassname == 'Propal') $newclassname = 'CommercialProposal';
+			print '<tr><td>'.$langs->trans($newclassname).'</td><td colspan="2">'.$objectsrc->getNomUrl(1).'</td></tr>';
 
-        	// Amount
-        	/* Hide amount because we only copy services so amount may differ than source
+			// Amount
+			/* Hide amount because we only copy services so amount may differ than source
         	print '<tr><td>' . $langs->trans('AmountHT') . '</td><td>' . price($objectsrc->total_ht) . '</td></tr>';
         	print '<tr><td>' . $langs->trans('AmountVAT') . '</td><td>' . price($objectsrc->total_tva) . "</td></tr>";
         	if ($mysoc->localtax1_assuj == "1" || $objectsrc->total_localtax1 != 0) 		// Localtax1 RE
@@ -1000,14 +1000,14 @@ if ($action == 'create')
         		print '<tr><td>' . $langs->trans('MulticurrencyAmountTTC') . '</td><td>' . price($objectsrc->multicurrency_total_ttc) . "</td></tr>";
         	}
         	*/
-        }
+		}
 
-        print '</table>';
+		print '</table>';
 
-	    if (is_object($objectsrc))
-	    {
-	        print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
-	        print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
+		if (is_object($objectsrc))
+		{
+			print '<input type="hidden" name="origin"         value="'.$objectsrc->element.'">';
+			print '<input type="hidden" name="originid"       value="'.$objectsrc->id.'">';
 		} elseif ($origin == 'project' && !empty($projectid)) {
 			print '<input type="hidden" name="projectid" value="'.$projectid.'">';
 		}
@@ -1016,8 +1016,8 @@ if ($action == 'create')
 
 		print '<div class="center">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-    	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
 		print '</form>';
@@ -1058,8 +1058,8 @@ if ($action == 'create')
 		print '<div class="center">';
 		print '<input type="hidden" name="action" value="create">';
 		print '<input type="submit" class="button" value="'.$langs->trans("CreateDraftIntervention").'">';
-    	print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
-    	print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
+		print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+		print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';
 		print '</div>';
 
 		print '</form>';
@@ -1172,46 +1172,46 @@ if ($action == 'create')
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($user->rights->ficheinter->creer)
-	    {
-            if ($action != 'classify') {
-                $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            }
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-            }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-	            $morehtmlref .= $proj->ref;
-	            $morehtmlref .= '</a>';
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->ficheinter->creer)
+		{
+			if ($action != 'classify') {
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-    print '<div class="fichecenter">';
-    print '<div class="fichehalfleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield" width="100%">';
 
 	if (!empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES))
 	{
@@ -1269,47 +1269,47 @@ if ($action == 'create')
 			$formcontract->formSelectContract($_SERVER["PHP_SELF"].'?id='.$object->id, $object->socid, $object->fk_contrat, 'contratid', 0, 1, 1);
 		} else {
 			if ($object->fk_contrat)
-            {
-                $contratstatic = new Contrat($db);
-                $contratstatic->fetch($object->fk_contrat);
-                //print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
-                print $contratstatic->getNomUrl(0, '', 1);
-            } else {
-                print "&nbsp;";
-            }
+			{
+				$contratstatic = new Contrat($db);
+				$contratstatic->fetch($object->fk_contrat);
+				//print '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$selected.'">'.$projet->title.'</a>';
+				print $contratstatic->getNomUrl(0, '', 1);
+			} else {
+				print "&nbsp;";
+			}
 		}
 		print '</td>';
 		print '</tr>';
 	}
 
-    // Other attributes
-    $cols = 2;
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+	// Other attributes
+	$cols = 2;
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-    print '<div class="fichehalfright">';
-    print '<div class="ficheaddleft">';
-    print '<div class="underbanner clearboth"></div>';
+	print '</div>';
+	print '<div class="fichehalfright">';
+	print '<div class="ficheaddleft">';
+	print '<div class="underbanner clearboth"></div>';
 
-    print '<table class="border tableforfield centpercent">';
+	print '<table class="border tableforfield centpercent">';
 
-    if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
-    {
-        // Duration
-        print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
-        print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
-        print '</tr>';
-    }
+	if (empty($conf->global->FICHINTER_DISABLE_DETAILS))
+	{
+		// Duration
+		print '<tr><td class="titlefield">'.$langs->trans("TotalDuration").'</td>';
+		print '<td>'.convertSecondToTime($object->duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY).'</td>';
+		print '</tr>';
+	}
 
 	print "</table>";
 
 	print '</div>';
-    print '</div>';
-    print '</div>';
+	print '</div>';
+	print '</div>';
 
-    print '<div class="clearboth"></div><br>';
+	print '<div class="clearboth"></div><br>';
 
 
 	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB))
@@ -1464,25 +1464,25 @@ if ($action == 'create')
 
 					// Date d'intervention
 					print '<td class="center nowrap">';
-                    if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
-                        print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention");
-                    } else {
-                        print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention");
-                    }
+					if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+						print $form->selectDate($db->jdate($objp->date_intervention), 'di', 0, 0, 0, "date_intervention");
+					} else {
+						print $form->selectDate($db->jdate($objp->date_intervention), 'di', 1, 1, 0, "date_intervention");
+					}
 					print '</td>';
 
-                    // Duration
-                    print '<td class="right">';
-                    if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
-                        $selectmode = 'select';
-                        if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION))
-                            $selectmode = 'text';
-                        $form->select_duration('duration', $objp->duree, 0, $selectmode);
-                    }
-                    print '</td>';
+					// Duration
+					print '<td class="right">';
+					if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
+						$selectmode = 'select';
+						if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION))
+							$selectmode = 'text';
+						$form->select_duration('duration', $objp->duree, 0, $selectmode);
+					}
+					print '</td>';
 
-                    print '<td class="center" colspan="5" valign="center">';
-                    print '<input type="submit" class="button buttongen marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
+					print '<td class="center" colspan="5" valign="center">';
+					print '<input type="submit" class="button buttongen marginbottomonly" name="save" value="'.$langs->trans("Save").'">';
 					print '<input type="submit" class="button buttongen marginbottomonly" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
 					print '</tr>'."\n";
 
@@ -1514,13 +1514,13 @@ if ($action == 'create')
 						print '<td width="5" class="center linecolnum"></td>';
 					}
 
-    				print '<td>';
-    				print '<a name="add"></a>'; // ancre
-    				print $langs->trans('Description').'</td>';
-    				print '<td class="center">'.$langs->trans('Date').'</td>';
-    				print '<td class="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
-      				print '<td colspan="3">&nbsp;</td>';
-    				print "</tr>\n";
+					print '<td>';
+					print '<a name="add"></a>'; // ancre
+					print $langs->trans('Description').'</td>';
+					print '<td class="center">'.$langs->trans('Date').'</td>';
+					print '<td class="right">'.(empty($conf->global->FICHINTER_WITHOUT_DURATION) ? $langs->trans('Duration') : '').'</td>';
+	  				print '<td colspan="3">&nbsp;</td>';
+					print "</tr>\n";
 				}
 
 				print '<tr class="oddeven nohover">'."\n";
@@ -1530,43 +1530,43 @@ if ($action == 'create')
 					print '<td class="center linecolnum">'.($i + 1).'</td>';
 				}
 
-                print '<td>';
-                // editeur wysiwyg
-                if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
-                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-                    $doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
-                    $doleditor->Create();
-                }
-                print '</td>';
+				print '<td>';
+				// editeur wysiwyg
+				if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+					$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
+					$doleditor->Create();
+				}
+				print '</td>';
 
-                // Date intervention
-                print '<td class="center nowrap">';
+				// Date intervention
+				print '<td class="center nowrap">';
 				$now = dol_now();
 				$timearray = dol_getdate($now);
 				if (!GETPOST('diday', 'int')) {
-                    $timewithnohour = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
-                } else {
-                    $timewithnohour = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
-                }
-                if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
-                    print $form->selectDate($timewithnohour, 'di', 0, 0, 0, "addinter");
-                } else {
-                    print $form->selectDate($timewithnohour, 'di', 1, 1, 0, "addinter");
-                }
+					$timewithnohour = dol_mktime(0, 0, 0, $timearray['mon'], $timearray['mday'], $timearray['year']);
+				} else {
+					$timewithnohour = dol_mktime(GETPOST('dihour', 'int'), GETPOST('dimin', 'int'), 0, GETPOST('dimonth', 'int'), GETPOST('diday', 'int'), GETPOST('diyear', 'int'));
+				}
+				if (!empty($conf->global->FICHINTER_DATE_WITHOUT_HOUR)) {
+					print $form->selectDate($timewithnohour, 'di', 0, 0, 0, "addinter");
+				} else {
+					print $form->selectDate($timewithnohour, 'di', 1, 1, 0, "addinter");
+				}
 				print '</td>';
 
-                // Duration
-                print '<td class="right">';
-                if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
-                    $selectmode = 'select';
-                    if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
-                        $selectmode = 'text';
-                    }
-                    $form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
-                }
-                print '</td>';
+				// Duration
+				print '<td class="right">';
+				if (empty($conf->global->FICHINTER_WITHOUT_DURATION)) {
+					$selectmode = 'select';
+					if (!empty($conf->global->INTERVENTION_ADDLINE_FREEDUREATION)) {
+						$selectmode = 'text';
+					}
+					$form->select_duration('duration', (!GETPOST('durationhour', 'int') && !GETPOST('durationmin', 'int')) ? 3600 : (60 * 60 * GETPOST('durationhour', 'int') + 60 * GETPOST('durationmin', 'int')), 0, $selectmode);
+				}
+				print '</td>';
 
-                print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
+				print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button" value="'.$langs->trans('Add').'" name="addline"></td>';
 				print '</tr>';
 
 				//Line extrafield
@@ -1601,22 +1601,22 @@ if ($action == 'create')
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		                                                                                          // modified by hook
+																								  // modified by hook
 	if (empty($reshook))
 	{
 		if ($user->socid == 0)
 		{
-            if ($action != 'editdescription' && ($action != 'presend')) {
-                // Validate
-                if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
-                    if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) {
-                        print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
-                        print '>'.$langs->trans("Validate").'</a></div>';
-                    }
-                }
+			if ($action != 'editdescription' && ($action != 'presend')) {
+				// Validate
+				if ($object->statut == Fichinter::STATUS_DRAFT && (count($object->lines) > 0 || !empty($conf->global->FICHINTER_DISABLE_DETAILS))) {
+					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->validate)) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=validate"';
+						print '>'.$langs->trans("Validate").'</a></div>';
+					}
+				}
 
-                // Modify
-                if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate)))
+				// Modify
+				if ($object->statut == Fichinter::STATUS_VALIDATED && ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->creer) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->ficheinter->ficheinter_advance->unvalidate)))
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?id='.$object->id.'&action=modify">';
 					if (empty($conf->global->FICHINTER_DISABLE_DETAILS)) print $langs->trans("Modify");
@@ -1625,7 +1625,7 @@ if ($action == 'create')
 				}
 
 				// Reopen
-				if ($object->statut > Fichinter::STATUS_CLOSED)
+				if ($object->statut >= Fichinter::STATUS_CLOSED)
 				{
 					if ($user->rights->ficheinter->creer)
 					{
@@ -1645,7 +1645,7 @@ if ($action == 'create')
 				}
 
 				// create intervention model
-				if ($conf->global->MAIN_FEATURES_LEVEL >= 2 && $object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
+				if ($conf->global->MAIN_FEATURES_LEVEL >= 1 && $object->statut == Fichinter::STATUS_DRAFT && $user->rights->ficheinter->creer && (count($object->lines) > 0)) {
 					print '<div class="inline-block divButAction">';
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card-rec.php?id='.$object->id.'&action=create">'.$langs->trans("ChangeIntoRepeatableIntervention").'</a>';
 					print '</div>';
@@ -1684,7 +1684,7 @@ if ($action == 'create')
 				}
 
 				// Done
-            	if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED)
+				if (empty($conf->global->FICHINTER_CLASSIFY_BILLED) && $object->statut > Fichinter::STATUS_DRAFT && $object->statut < Fichinter::STATUS_CLOSED)
 				{
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=classifydone">'.$langs->trans("InterventionClassifyDone").'</a></div>';
 				}
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index 818c1763786..c9e689ffd4c 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -250,12 +250,11 @@ class FichinterRec extends Fichinter
 	 */
 	public function fetch($rowid = 0, $ref = '', $ref_ext = '')
 	{
-		$sql = 'SELECT f.titre, f.fk_soc';
+		$sql = 'SELECT f.titre as title, f.fk_soc';
 		$sql .= ', f.datec, f.duree, f.fk_projet, f.fk_contrat, f.description';
 		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
 		$sql .= ', f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.auto_validate';
 		$sql .= ', f.note_private, f.note_public, f.fk_user_author';
-
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinter_rec as f';
 		if ($rowid > 0) $sql .= ' WHERE f.rowid='.$rowid;
 		elseif ($ref) $sql .= " WHERE f.titre='".$this->db->escape($ref)."'";
@@ -268,8 +267,9 @@ class FichinterRec extends Fichinter
 				$obj = $this->db->fetch_object($result);
 
 				$this->id = $rowid;
-				$this->titre				= $obj->titre;
-				$this->ref = $obj->titre;
+				$this->titre				= $obj->title;
+				$this->title				= $obj->title;
+				$this->ref = $obj->title;
 				$this->description = $obj->description;
 				$this->datec				= $obj->datec;
 				$this->duration = $obj->duree;
diff --git a/htdocs/fichinter/class/fichinterstats.class.php b/htdocs/fichinter/class/fichinterstats.class.php
index 1355c7a97cf..608b7d75f25 100644
--- a/htdocs/fichinter/class/fichinterstats.class.php
+++ b/htdocs/fichinter/class/fichinterstats.class.php
@@ -64,7 +64,6 @@ class FichinterStats extends Stats
         $this->userid = $userid;
         $this->cachefilesuffix = $mode;
 
-        $this->where .= " c.entity = ".$conf->entity;
         if ($mode == 'customer')
         {
             $object = new Fichinter($this->db);
@@ -75,6 +74,8 @@ class FichinterStats extends Stats
             //$this->where.= " AND c.fk_statut > 0";    // Not draft and not cancelled
         }
         if (!$user->rights->societe->client->voir && !$this->socid) $this->where .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;
+        $this->where .= ($this->where ? ' AND ' : '')."c.entity IN (".getEntity('fichinter').')';
+
         if ($this->socid)
         {
             $this->where .= " AND c.fk_soc = ".$this->socid;
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 9aeef877bab..1ad41c08da0 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -417,6 +417,20 @@ if ($object->id > 0)
 	    $boxstat .= '<span class="boxstatsindicator'.($outstandingOpened > 0 ? ' amountremaintopay' : '').'">'.price($outstandingOpened, 1, $langs, 1, -1, -1, $conf->currency).$warn.'</span>';
 	    $boxstat .= '</div>';
 	    if ($link) $boxstat .= '</a>';
+
+		$tmp = $object->getOutstandingBills('supplier', 1);
+		$outstandingOpenedLate = $tmp['opened'];
+		if ($outstandingOpened != $outstandingOpenedLate && !empty($outstandingOpenedLate)) {
+			$text = $langs->trans("CurrentOutstandingBillLate");
+			$link = DOL_URL_ROOT.'/fourn/recap-fourn.php?socid='.$object->id;
+			$icon = 'bill';
+			if ($link) $boxstat .= '<a href="'.$link.'" class="boxstatsindicator thumbstat nobold nounderline">';
+			$boxstat .= '<div class="boxstats" title="' . dol_escape_htmltag($text) . '">';
+			$boxstat .= '<span class="boxstatstext">' . img_object("", $icon) . ' <span>' . $text . '</span></span><br>';
+			$boxstat .= '<span class="boxstatsindicator' . ($outstandingOpenedLate > 0 ? ' amountremaintopay' : '') . '">'.price($outstandingOpenedLate, 1, $langs, 1, -1, -1, $conf->currency) . $warn . '</span>';
+			$boxstat .= '</div>';
+			if ($link) $boxstat .= '</a>';
+		}
 	}
 
 	$boxstat .= '</td></tr>';
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 3d6d2c2f837..3ae4e45964c 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -1292,7 +1292,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= ", ".$conf->entity;
 		$sql .= ", ".$this->socid;
 		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : "null");
-		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", '".$this->db->idate($date)."'";
 		$sql .= ", ".($this->date_livraison ? "'".$this->db->idate($this->date_livraison)."'" : "null");
 		$sql .= ", ".$user->id;
 		$sql .= ", ".self::STATUS_DRAFT;
@@ -1554,7 +1554,7 @@ class CommandeFournisseur extends CommonOrder
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 			// Clean parameters
-			if (!$qty) $qty = 1;
+			if (empty($qty)) $qty = 0;
 			if (!$info_bits) $info_bits = 0;
 			if (empty($txtva)) $txtva = 0;
 			if (empty($txlocaltax1)) $txlocaltax1 = 0;
@@ -1660,13 +1660,13 @@ class CommandeFournisseur extends CommonOrder
 					{
 						$qty = $prod->packaging;
 					} else {
-						if (($qty % $prod->packaging) > 0)
+						if (!empty($prod->packaging) && ($qty % $prod->packaging) > 0)
 						{
 							$coeff = intval($qty / $prod->packaging) + 1;
 							$qty = $prod->packaging * $coeff;
-							setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 						}
 					}
+					setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 				}
 			} else {
 				$product_type = $type;
@@ -2526,7 +2526,6 @@ class CommandeFournisseur extends CommonOrder
 
 			$remise_percent = price2num($remise_percent);
 			$qty = price2num($qty);
-			if (!$qty) $qty = 1;
 			$pu = price2num($pu);
 			$pu_ht_devise = price2num($pu_ht_devise);
 			$txtva = price2num($txtva);
@@ -3292,11 +3291,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 */
 	public $fk_facture;
 
-	/**
-	 * @var string supplier order line label
-	 */
-	public $label;
-
 	public $rang = 0;
 	public $special_code = 0;
 
@@ -3317,7 +3311,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
 	 */
 	public $ref_supplier;
 	public $remise;
-	public $product_libelle;
 
 
 	/**
@@ -3345,7 +3338,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		$sql .= ' cd.remise, cd.remise_percent, cd.subprice,';
 		$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
 		$sql .= ' cd.total_localtax1, cd.total_localtax2,';
-		$sql .= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc,';
+		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
 		$sql .= ' cd.date_start, cd.date_end, cd.fk_unit,';
 		$sql .= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
 		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
@@ -3388,8 +3381,9 @@ class CommandeFournisseurLigne extends CommonOrderLine
 				$this->special_code     = $objp->special_code;
 
 				$this->ref = $objp->product_ref;
+
 				$this->product_ref      = $objp->product_ref;
-				$this->product_libelle  = $objp->product_libelle;
+				$this->product_label    = $objp->product_label;
 				$this->product_desc     = $objp->product_desc;
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING))
 				{
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index 0c0e32a2055..1761215705b 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -38,6 +38,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commoninvoice.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+if (!empty($conf->accounting->enabled)) require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
+
 /**
  *	Class to manage suppliers invoices
  */
@@ -95,12 +98,18 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $ref;
 
-	public $label;
-	public $libelle; // @deprecated
-
-	public $product_ref;
+	/**
+	 * @var string Ref supplier
+	 */
 	public $ref_supplier;
+
+	/**
+	 * @var string Label of invoice
+	 */
+	public $label;
+
 	public $socid;
+
 	//Check constants for types
 	public $type = self::TYPE_STANDARD;
 
@@ -702,7 +711,7 @@ class FactureFournisseur extends CommonInvoice
 				$this->note_private			= $obj->note_private;
 				$this->note_public = $obj->note_public;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;	// deprecated
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->import_key = $obj->import_key;
 
 				//Incoterms
@@ -765,7 +774,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ', f.localtax1_tx, f.localtax2_tx, f.localtax1_type, f.localtax2_type, f.total_localtax1, f.total_localtax2, f.fk_facture_fourn ';
 		$sql .= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits, f.rang, f.special_code, f.fk_parent_line, f.fk_unit';
 		$sql .= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
-		$sql .= ', fk_code_ventilation, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
+		$sql .= ', f.fk_code_ventilation, f.fk_multicurrency, f.multicurrency_code, f.multicurrency_subprice, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
 		$sql .= ' WHERE fk_facture_fourn='.$this->id;
@@ -827,7 +836,7 @@ class FactureFournisseur extends CommonInvoice
 
 					// Accountancy
 					$line->code_ventilation = $obj->fk_code_ventilation;
-					$line->fk_accounting_account	= $obj->fk_code_ventilation;
+					$line->fk_accounting_account = $obj->fk_code_ventilation;
 
 					// Multicurrency
 					$line->fk_multicurrency = $obj->fk_multicurrency;
@@ -2286,7 +2295,7 @@ class FactureFournisseur extends CommonInvoice
 		if ($this->type == self::TYPE_CREDIT_NOTE) $picto .= 'a'; // Credit note
 		if ($this->type == self::TYPE_DEPOSIT)     $picto .= 'd'; // Deposit invoice
 
-		$label = '<u>'.$langs->trans("SupplierInvoice").'</u>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("SupplierInvoice").'</u>';
 		if ($this->type == self::TYPE_REPLACEMENT) $label = '<u>'.$langs->transnoentitiesnoconv("InvoiceReplace").'</u>';
 		elseif ($this->type == self::TYPE_CREDIT_NOTE) $label = '<u>'.$langs->transnoentitiesnoconv("CreditNote").'</u>';
 		elseif ($this->type == self::TYPE_DEPOSIT)     $label = '<u>'.$langs->transnoentitiesnoconv("Deposit").'</u>';
@@ -2301,7 +2310,7 @@ class FactureFournisseur extends CommonInvoice
 		if (!empty($this->total_ht))
 			$label .= '<br><b>'.$langs->trans('AmountHT').':</b> '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_tva))
-			$label .= '<br><b>'.$langs->trans('VAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
+			$label .= '<br><b>'.$langs->trans('AmountVAT').':</b> '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
 		if (!empty($this->total_ttc))
 			$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 		if ($moretitle) $label .= ' - '.$moretitle;
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 8752d17a5d8..924734f69c5 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -272,7 +272,7 @@ class ProductFournisseur extends Product
 		$charges = price2num($charges, 'MU');
         $qty = price2num($qty, 'MS');
 		$unitBuyPrice = price2num($buyprice / $qty, 'MU');
-		$packaging = ($this->packaging < $qty) ? $qty : $this->packaging;
+		$packaging = price2num((($this->packaging < $qty) ? $qty : $this->packaging), 'MS');
 
 		$error = 0;
 		$now = dol_now();
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 419d5c7a559..7cbe020142f 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -406,7 +406,7 @@ if (empty($reshook))
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
-		if (!GETPOST('qty'))
+		if (GETPOST('qty', 'int') == '')
 		{
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
@@ -666,7 +666,7 @@ if (empty($reshook))
 		$productsupplier = new ProductFournisseur($db);
 		if (!empty($conf->global->SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY))
 		{
-			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0)
+			if ($line->fk_product > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty', 'int')), $line->fk_product, 'none', GETPOST('socid', 'int')) < 0)
 			{
 				setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 			}
@@ -719,7 +719,7 @@ if (empty($reshook))
 			$lineid,
 			$_POST['product_desc'],
 			$ht,
-			$_POST['qty'],
+			GETPOST('qty', 'int'),
 			$_POST['remise_percent'],
 			$vat_rate,
 			$localtax1_rate,
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index 7a11d22aa53..c3d0a897362 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -1165,13 +1165,13 @@ if ($id > 0 || !empty($ref)) {
 				if ($action == 'editline' && $lineid == $objp->dispatchlineid)
 				{
 					print '<form name="editdispatchedlines" id="editdispatchedlines" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#line_' . GETPOST('lineid') . '" method="POST">
-					<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">
+					<input type="hidden" name="token" value="'.newToken().'">
 					<input type="hidden" name="action" value="updateline">
 					<input type="hidden" name="mode" value="">
-					<input type="hidden" name="lineid" value="' . $objp->dispatchlineid . '">';
+					<input type="hidden" name="lineid" value="'.$objp->dispatchlineid.'">';
 				}
 
-				print '<tr ' . $bc[$var] . ' id="line_'.$objp->dispatchlineid.'" >';
+				print '<tr class="oddeven" id="line_'.$objp->dispatchlineid.'" >';
 
 				if (!empty($conf->reception->enabled)) {
 					print '<td>';
@@ -1290,7 +1290,7 @@ if ($id > 0 || !empty($ref)) {
 					print '</td>';
 				}
 
-				if ($action != 'editline' ||  && $lineid != $objp->dispatchlineid)
+				if ($action != 'editline' || $lineid != $objp->dispatchlineid)
 				{
 					print '<td class="linecoledit center">';
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=editline&amp;lineid=' . $objp->dispatchlineid .'#line_'. $objp->dispatchlineid . '">';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index a1dfb78a2c5..830d391ad9c 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -364,30 +364,30 @@ if (empty($reshook))
 							{
 								$fk_parent_line = 0;
 							}
-                            $result = $objecttmp->addline(
+							$result = $objecttmp->addline(
 								$desc,
 								$lines[$i]->subprice,
 								$lines[$i]->tva_tx,
 								$lines[$i]->localtax1_tx,
 								$lines[$i]->localtax2_tx,
-                            	$lines[$i]->qty,
-                            	$lines[$i]->fk_product,
+								$lines[$i]->qty,
+								$lines[$i]->fk_product,
 								$lines[$i]->remise_percent,
 								$date_start,
 								$date_end,
 								0,
 								$lines[$i]->info_bits,
-                            	'HT',
-                            	$product_type,
-                            	$lines[$i]->rang,
-                            	false,
-                            	$lines[$i]->array_options,
-                            	$lines[$i]->fk_unit,
-                            	$objecttmp->origin_id,
-                            	$lines[$i]->pa_ht,
-                            	$lines[$i]->ref_supplier,
-                            	$lines[$i]->special_code,
-                            	$fk_parent_line
+								'HT',
+								$product_type,
+								$lines[$i]->rang,
+								false,
+								$lines[$i]->array_options,
+								$lines[$i]->fk_unit,
+								$objecttmp->origin_id,
+								$lines[$i]->pa_ht,
+								$lines[$i]->ref_supplier,
+								$lines[$i]->special_code,
+								$fk_parent_line
 							);
 							if ($result > 0)
 							{
@@ -686,7 +686,7 @@ if ($resql)
 	$arrayofmassactions = array(
 		'generate_doc'=>$langs->trans("ReGeneratePDF"),
 		'builddoc'=>$langs->trans("PDFMerge"),
-	    'presend'=>$langs->trans("SendByMail"),
+		'presend'=>$langs->trans("SendByMail"),
 	);
 	if ($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills'] = $langs->trans("CreateInvoiceForThisSupplier");
 	if ($user->rights->fournisseur->commande->supprimer) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
@@ -782,7 +782,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -977,7 +977,7 @@ if ($resql)
 	if (!empty($arrayfields['cf.billed']['checked']))
 	{
 		print '<td class="liste_titre center">';
-		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1);
+		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
 	// Action column
@@ -1293,14 +1293,14 @@ if ($resql)
 
 	$db->free($resql);
 
-    $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-    $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
+	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 
-    print '</table>'."\n";
-    print '</div>';
+	print '</table>'."\n";
+	print '</div>';
 
-    print '</form>'."\n";
+	print '</form>'."\n";
 
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b0f178c6fc4..56f2bef6c6a 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -8,8 +8,8 @@
  * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2016-2017	Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2020	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Ferran Marcet	        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -153,21 +153,21 @@ if (empty($reshook))
 	// Action clone object
 	if ($action == 'confirm_clone' && $confirm == 'yes' && $permissiontoadd)
 	{
-	    $objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
+		$objectutil = dol_clone($object, 1); // To avoid to denaturate loaded object when setting some properties for clone. We use native clone to keep this->db valid.
 
-	    if (GETPOST('newsupplierref', 'alphanohtml')) $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
-	    $objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
+		if (GETPOST('newsupplierref', 'alphanohtml')) $objectutil->ref_supplier = GETPOST('newsupplierref', 'alphanohtml');
+		$objectutil->date = dol_mktime(12, 0, 0, GETPOST('newdatemonth', 'int'), GETPOST('newdateday', 'int'), GETPOST('newdateyear', 'int'));
 
-	    $result = $objectutil->createFromClone($user, $id);
-        if ($result > 0)
-        {
-        	header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
-        	exit;
-        } else {
-        	$langs->load("errors");
-        	setEventMessages($objectutil->error, $objectutil->errors, 'errors');
-        	$action = '';
-        }
+		$result = $objectutil->createFromClone($user, $id);
+		if ($result > 0)
+		{
+			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
+			exit;
+		} else {
+			$langs->load("errors");
+			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
+			$action = '';
+		}
 	}	elseif ($action == 'confirm_valid' && $confirm == 'yes' && $usercanvalidate) {
 		$idwarehouse = GETPOST('idwarehouse');
 
@@ -347,6 +347,12 @@ if (empty($reshook))
 		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
 	}
 
+    // transport mode
+    if ($action == 'settransportmode' && $user->rights->fournisseur->facture->creer)
+    {
+        $result=$object->setTransportMode(GETPOST('transport_mode_id', 'int'));
+    }
+
 	// Set label
 	elseif ($action == 'setlabel' && $usercancreate)
 	{
@@ -660,7 +666,8 @@ if (empty($reshook))
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx	= GETPOST('originmulticurrency_tx', 'int');
+				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
 
 				// Proprietes particulieres a facture de remplacement
 				$object->fk_facture_source = GETPOST('fac_replacement');
@@ -725,7 +732,8 @@ if (empty($reshook))
 				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
 				$object->location_incoterms	= GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code	= GETPOST('multicurrency_code', 'alpha');
-				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				$object->multicurrency_tx	= GETPOST('originmulticurrency_tx', 'int');
+				$object->transport_mode_id	= GETPOST('transport_mode_id', 'int');
 
 				// Proprietes particulieres a facture avoir
 				$object->fk_facture_source = $sourceinvoice > 0 ? $sourceinvoice : '';
@@ -838,6 +846,7 @@ if (empty($reshook))
 				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 				$object->multicurrency_tx = GETPOST('originmulticurrency_tx', 'int');
+				$object->transport_mode_id	= GETPOST('transport_mode_id');
 
 				// Auto calculation of date due if not filled by user
 				if (empty($object->date_echeance)) $object->date_echeance = $object->calculate_date_lim_reglement();
@@ -1041,7 +1050,7 @@ if (empty($reshook))
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
-        $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 
 		if (GETPOST('price_ht') != '')
 		{
@@ -1077,17 +1086,17 @@ if (empty($reshook))
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 
-	    // Define info_bits
-	    $info_bits = 0;
-	    if (preg_match('/\*/', $tva_tx))
-	    	$info_bits |= 0x01;
+		// Define info_bits
+		$info_bits = 0;
+		if (preg_match('/\*/', $tva_tx))
+			$info_bits |= 0x01;
 
-	    // Define vat_rate
-	    $tva_tx = str_replace('*', '', $tva_tx);
-        $localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
-        $localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
+		// Define vat_rate
+		$tva_tx = str_replace('*', '', $tva_tx);
+		$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
+		$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-        $remise_percent = GETPOST('remise_percent');
+		$remise_percent = GETPOST('remise_percent');
 		$pu_ht_devise = GETPOST('multicurrency_subprice');
 
 		// Extrafields Lines
@@ -1100,12 +1109,12 @@ if (empty($reshook))
 			}
 		}
 
-        $result = $object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
-        if ($result >= 0)
-        {
-            unset($_POST['label']);
-            unset($_POST['fourn_ref']);
-            unset($_POST['date_starthour']);
+		$result = $object->updateline(GETPOST('lineid'), $label, $up, $tva_tx, $localtax1_tx, $localtax2_tx, GETPOST('qty'), GETPOST('productid'), $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $_POST['units'], $pu_ht_devise, GETPOST('fourn_ref', 'alpha'));
+		if ($result >= 0)
+		{
+			unset($_POST['label']);
+			unset($_POST['fourn_ref']);
+			unset($_POST['date_starthour']);
 			unset($_POST['date_startmin']);
 			unset($_POST['date_startsec']);
 			unset($_POST['date_startday']);
@@ -1250,7 +1259,7 @@ if (empty($reshook))
 
 				// if we use supplier description of the products
 				if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
-				    $desc = $productsupplier->desc_supplier;
+					$desc = $productsupplier->desc_supplier;
 				} else $desc = $productsupplier->description;
 
 				if (trim($product_desc) != trim($desc)) $desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
@@ -1301,8 +1310,8 @@ if (empty($reshook))
 					$array_options,
 					$productsupplier->fk_unit,
 					0,
-                    $pu_ht_devise,
-                    $ref_supplier,
+					$pu_ht_devise,
+					$ref_supplier,
 					''
 				);
 			}
@@ -1430,34 +1439,34 @@ if (empty($reshook))
 
 		if (!$ventilExportCompta)
 		{
-		    // On verifie si aucun paiement n'a ete effectue
+			// On verifie si aucun paiement n'a ete effectue
 			if ($resteapayer == price2num($object->total_ttc, 'MT', 1) && $object->statut == FactureFournisseur::STATUS_VALIDATED)
-		    {
-	            $idwarehouse = GETPOST('idwarehouse');
+			{
+				$idwarehouse = GETPOST('idwarehouse');
 
-	            $object->fetch_thirdparty();
+				$object->fetch_thirdparty();
 
-	            $qualified_for_stock_change = 0;
-	            if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-	            {
-	                $qualified_for_stock_change = $object->hasProductsOrServices(2);
-	            } else {
-	                $qualified_for_stock_change = $object->hasProductsOrServices(1);
-	            }
+				$qualified_for_stock_change = 0;
+				if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+				{
+					$qualified_for_stock_change = $object->hasProductsOrServices(2);
+				} else {
+					$qualified_for_stock_change = $object->hasProductsOrServices(1);
+				}
 
-	            // Check parameters
-	            if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-	            {
-	                $langs->load("stocks");
-	                if (!$idwarehouse || $idwarehouse == -1)
-	                {
-	                    $error++;
-	                    setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
-	                    $action = '';
-	                }
-	            }
+				// Check parameters
+				if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+				{
+					$langs->load("stocks");
+					if (!$idwarehouse || $idwarehouse == -1)
+					{
+						$error++;
+						setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
+						$action = '';
+					}
+				}
 
-	            $object->setDraft($user, $idwarehouse);
+				$object->setDraft($user, $idwarehouse);
 
 				// Define output language
 				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
@@ -1687,6 +1696,7 @@ if ($action == 'create')
 		$remise_percent 	= (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0));
 		$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 		$dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '';
+		$transport_mode_id  = (!empty($objectsrc->transport_mode_id) ? $objectsrc->transport_mode_id : (!empty($soc->transport_mode_id) ? $soc->transport_mode_id : 0));
 
 		if (!empty($conf->multicurrency->enabled))
 		{
@@ -1705,6 +1715,7 @@ if ($action == 'create')
 	} else {
 		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
 		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
+		$transport_mode_id	= $societe->transport_mode_supplier_id;
 		$fk_account         = $societe->fk_account;
 		$datetmp = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 		$dateinvoice = ($datetmp == '' ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $datetmp);
@@ -1771,9 +1782,9 @@ if ($action == 'create')
 	print '</td></tr>';
 
 	// Ref supplier
-    print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : $objectsrc->ref_supplier).'" type="text"';
-    if ($societe->id > 0) print ' autofocus';
-    print '></td>';
+	print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : $objectsrc->ref_supplier).'" type="text"';
+	if ($societe->id > 0) print ' autofocus';
+	print '></td>';
 	print '</tr>';
 
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Type').'</td><td>';
@@ -2053,13 +2064,22 @@ if ($action == 'create')
 		print '</td></tr>';
 	}
 
+    // Intracomm report
+    if (!empty($conf->intracommreport->enabled))
+    {
+        $langs->loadLangs(array("intracommreport"));
+        print '<tr><td>' . $langs->trans('IntracommReportTransportMode') . '</td><td>';
+        $form->selectModeTransport(isset($_POST['transport_mode_id']) ? $_POST['transport_mode_id'] : $transport_mode_id, 'transport_mode_id');
+        print '</td></tr>';
+    }
+
 	// Public note
 	print '<tr><td>'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
 	$doleditor = new DolEditor('note_public', (GETPOSTISSET('note_public') ?GETPOST('note_public', 'restricthtml') : $note_public), '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, '90%');
 	print $doleditor->Create(1);
 	print '</td>';
-    // print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
+	// print '<td><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_5.'"></textarea></td>';
 	print '</tr>';
 
 	// Private note
@@ -2109,7 +2129,7 @@ if ($action == 'create')
 			}
 		}
 
-		echo '</td></tr>';
+		print '</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($objectsrc->total_ht).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($objectsrc->total_tva)."</td></tr>";
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) //Localtax1
@@ -2241,8 +2261,8 @@ if ($action == 'create')
 		{
 			// Create an array for form
 			$formquestion = array(
-			    array('type' => 'text', 'name' => 'newsupplierref', 'label' => $langs->trans("RefSupplier"), 'value' => $langs->trans("CopyOf").' '.$object->ref_supplier),
-			    array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
+				array('type' => 'text', 'name' => 'newsupplierref', 'label' => $langs->trans("RefSupplier"), 'value' => $langs->trans("CopyOf").' '.$object->ref_supplier),
+				array('type' => 'date', 'name' => 'newdate', 'label' => $langs->trans("Date"), 'value' => dol_now())
 			);
 			// Ask confirmation to clone
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneInvoice', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 250);
@@ -2279,59 +2299,59 @@ if ($action == 'create')
 				$qualified_for_stock_change = $object->hasProductsOrServices(1);
 			}
 
-            if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-            {
-                $langs->load("stocks");
-                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-                $formproduct = new FormProduct($db);
-                $warehouse = new Entrepot($db);
-                $warehouse_array = $warehouse->list_array();
-                if (count($warehouse_array) == 1) {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockDecrease", current($warehouse_array)) : $langs->trans("WarehouseForStockIncrease", current($warehouse_array));
-                    $value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
-                } else {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockDecrease") : $langs->trans("SelectWarehouseForStockIncrease");
-                    $value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
-                }
-                $formquestion = array(
-                    array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
-                );
-            }
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+			{
+				$langs->load("stocks");
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+				$formproduct = new FormProduct($db);
+				$warehouse = new Entrepot($db);
+				$warehouse_array = $warehouse->list_array();
+				if (count($warehouse_array) == 1) {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockDecrease", current($warehouse_array)) : $langs->trans("WarehouseForStockIncrease", current($warehouse_array));
+					$value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
+				} else {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockDecrease") : $langs->trans("SelectWarehouseForStockIncrease");
+					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+				}
+				$formquestion = array(
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
+				);
+			}
 
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateBill'), $text, 'confirm_valid', $formquestion, 1, 1);
-        }
+		}
 
-        // Confirmation edit (back to draft)
-        if ($action == 'edit')
-        {
-            $formquestion = array();
+		// Confirmation edit (back to draft)
+		if ($action == 'edit')
+		{
+			$formquestion = array();
 
-            $qualified_for_stock_change = 0;
-            if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
-            {
-                $qualified_for_stock_change = $object->hasProductsOrServices(2);
-            } else {
-                $qualified_for_stock_change = $object->hasProductsOrServices(1);
-            }
-            if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
-            {
-                $langs->load("stocks");
-                require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
-                $formproduct = new FormProduct($db);
-                $warehouse = new Entrepot($db);
-                $warehouse_array = $warehouse->list_array();
-                if (count($warehouse_array) == 1) {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockIncrease", current($warehouse_array)) : $langs->trans("WarehouseForStockDecrease", current($warehouse_array));
-                    $value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
-                } else {
-                    $label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockIncrease") : $langs->trans("SelectWarehouseForStockDecrease");
-                    $value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
-                }
-                $formquestion = array(
-                    array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
-                );
-            }
-            $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateBill'), $langs->trans('ConfirmUnvalidateBill', $object->ref), 'confirm_edit', $formquestion, 1, 1);
+			$qualified_for_stock_change = 0;
+			if (empty($conf->global->STOCK_SUPPORTS_SERVICES))
+			{
+				$qualified_for_stock_change = $object->hasProductsOrServices(2);
+			} else {
+				$qualified_for_stock_change = $object->hasProductsOrServices(1);
+			}
+			if (!empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_BILL) && $qualified_for_stock_change)
+			{
+				$langs->load("stocks");
+				require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+				$formproduct = new FormProduct($db);
+				$warehouse = new Entrepot($db);
+				$warehouse_array = $warehouse->list_array();
+				if (count($warehouse_array) == 1) {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("WarehouseForStockIncrease", current($warehouse_array)) : $langs->trans("WarehouseForStockDecrease", current($warehouse_array));
+					$value = '<input type="hidden" id="idwarehouse" name="idwarehouse" value="'.key($warehouse_array).'">';
+				} else {
+					$label = $object->type == FactureFournisseur::TYPE_CREDIT_NOTE ? $langs->trans("SelectWarehouseForStockIncrease") : $langs->trans("SelectWarehouseForStockDecrease");
+					$value = $formproduct->selectWarehouses(GETPOST('idwarehouse') ?GETPOST('idwarehouse') : 'ifone', 'idwarehouse', '', 1);
+				}
+				$formquestion = array(
+					array('type' => 'other', 'name' => 'idwarehouse', 'label' => $label, 'value' => $value)
+				);
+			}
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('UnvalidateBill'), $langs->trans('ConfirmUnvalidateBill', $object->ref), 'confirm_edit', $formquestion, 1, 1);
 		}
 
 		// Confirmation set paid
@@ -2369,109 +2389,109 @@ if ($action == 'create')
 		print $formconfirm;
 
 
-        // Supplier invoice card
-        $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		// Supplier invoice card
+		$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    	$morehtmlref = '<div class="refidno">';
-    	// Ref supplier
-    	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
-    	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
-    	// Thirdparty
-    	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    	// Project
-    	if (!empty($conf->projet->enabled))
-    	{
-    	    $langs->load("projects");
-    	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	    if ($usercancreate)
-    	    {
-                if ($action != 'classify') {
-                    $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-                }
-                if ($action == 'classify') {
-                    //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                    $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                    $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                    $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                    $morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-                    $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                    $morehtmlref .= '</form>';
-                } else {
-                    $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-                }
-    	    } else {
-    	        if (!empty($object->fk_project)) {
-    	            $proj = new Project($db);
-    	            $proj->fetch($object->fk_project);
-    	            $morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    	            $morehtmlref .= $proj->ref;
-    	            $morehtmlref .= '</a>';
-    	        } else {
-    	            $morehtmlref .= '';
-    	        }
-    	    }
-    	}
-    	$morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		// Ref supplier
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+		if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+		// Project
+		if (!empty($conf->projet->enabled))
+		{
+			$langs->load("projects");
+			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+			if ($usercancreate)
+			{
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+				}
+				if ($action == 'classify') {
+					//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+					$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+					$morehtmlref .= $formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $object->socid : -1), $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (!empty($object->fk_project)) {
+					$proj = new Project($db);
+					$proj->fetch($object->fk_project);
+					$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+					$morehtmlref .= $proj->ref;
+					$morehtmlref .= '</a>';
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
 
-    	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-    	print '<div class="fichecenter">';
-    	print '<div class="fichehalfleft">';
-    	print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
 
-    	print '<table class="border tableforfield" width="100%">';
+		print '<table class="border tableforfield" width="100%">';
 
-        // Type
-        print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
-        print $object->getLibType();
-        if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
-        {
-            $facreplaced = new FactureFournisseur($db);
-            $facreplaced->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
-        }
-        if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
-        {
-            $facusing = new FactureFournisseur($db);
-            $facusing->fetch($object->fk_facture_source);
-            print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
-        }
+		// Type
+		print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td>';
+		print $object->getLibType();
+		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT)
+		{
+			$facreplaced = new FactureFournisseur($db);
+			$facreplaced->fetch($object->fk_facture_source);
+			print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
+		}
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE)
+		{
+			$facusing = new FactureFournisseur($db);
+			$facusing->fetch($object->fk_facture_source);
+			print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+		}
 
-        $facidavoir = $object->getListIdAvoirFromInvoice();
-        if (count($facidavoir) > 0)
-        {
-            print ' ('.$langs->transnoentities("InvoiceHasAvoir");
-            $i = 0;
-            foreach ($facidavoir as $id)
-            {
-                if ($i == 0) print ' ';
-                else print ',';
-                $facavoir = new FactureFournisseur($db);
-                $facavoir->fetch($id);
-                print $facavoir->getNomUrl(1);
-            }
-            print ')';
-        }
-        if (isset($facidnext) && $facidnext > 0)
-        {
-            $facthatreplace = new FactureFournisseur($db);
-            $facthatreplace->fetch($facidnext);
-            print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
-        }
-        if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
-            $discount = new DiscountAbsolute($db);
-            $result = $discount->fetch(0, 0, $object->id);
-            if ($result > 0) {
-                print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).'<br>';
-            }
-        }
-        print '</td></tr>';
+		$facidavoir = $object->getListIdAvoirFromInvoice();
+		if (count($facidavoir) > 0)
+		{
+			print ' ('.$langs->transnoentities("InvoiceHasAvoir");
+			$i = 0;
+			foreach ($facidavoir as $id)
+			{
+				if ($i == 0) print ' ';
+				else print ',';
+				$facavoir = new FactureFournisseur($db);
+				$facavoir->fetch($id);
+				print $facavoir->getNomUrl(1);
+			}
+			print ')';
+		}
+		if (isset($facidnext) && $facidnext > 0)
+		{
+			$facthatreplace = new FactureFournisseur($db);
+			$facthatreplace->fetch($facidnext);
+			print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
+		}
+		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE || $object->type == FactureFournisseur::TYPE_DEPOSIT) {
+			$discount = new DiscountAbsolute($db);
+			$result = $discount->fetch(0, 0, $object->id);
+			if ($result > 0) {
+				print '. '.$langs->trans("CreditNoteConvertedIntoDiscount", $object->getLibType(1), $discount->getNomUrl(1, 'discount')).'<br>';
+			}
+		}
+		print '</td></tr>';
 
 
-        // Relative and absolute discounts
+		// Relative and absolute discounts
 		print '<!-- Discounts --><tr><td>'.$langs->trans('Discounts');
 		print '</td><td>';
 
@@ -2482,18 +2502,18 @@ if ($action == 'create')
 
 		print '</td></tr>';
 
-        // Label
-        print '<tr>';
-        print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
-        print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
-        print '</tr>';
+		// Label
+		print '<tr>';
+		print '<td>'.$form->editfieldkey("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
+		print '<td>'.$form->editfieldval("Label", 'label', $object->label, $object, ($usercancreate)).'</td>';
+		print '</tr>';
 
-	    $form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $usercancreate && ($object->getSommePaiement() <= 0);
+		$form_permission = ($object->statut < FactureFournisseur::STATUS_CLOSED) && $usercancreate && ($object->getSommePaiement() <= 0);
 
-        // Date
-        print '<tr><td>'.$form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker').'</td><td colspan="3">';
-        print $form->editfieldval("Date", 'datef', $object->datep, $object, $form_permission, 'datepicker');
-        print '</td>';
+		// Date
+		print '<tr><td>'.$form->editfieldkey("DateInvoice", 'datef', $object->datep, $object, $form_permission, 'datepicker').'</td><td colspan="3">';
+		print $form->editfieldval("Date", 'datef', $object->datep, $object, $form_permission, 'datepicker');
+		print '</td>';
 
 		// Default terms of the settlement
 		$langs->load('bills');
@@ -2632,6 +2652,30 @@ if ($action == 'create')
 			print '</td></tr>';
 		}
 
+		// Intracomm report
+		if (!empty($conf->intracommreport->enabled)) {
+	        $langs->loadLangs(array("intracommreport"));
+	        print '<tr><td class="nowrap">';
+	        print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+	        print $langs->trans('IntracommReportTransportMode');
+	        print '</td>';
+	        if ($action != 'editmode' && $user->rights->fournisseur->facture->creer) {
+	            print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->trans('SetMode'), 1).'</a></td>';
+	        }
+	        print '</tr></table>';
+	        print '</td>';
+
+	        print '<td>';
+	        if ($action == 'editmode')
+	        {
+	            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'transport_mode_id', 1, 1);
+	        }
+	        else {
+	            $form->formSelectTransportMode($_SERVER['PHP_SELF'].'?id='.$object->id, $object->transport_mode_id, 'none');
+	        }
+	        print '</td></tr>';
+		}
+
 		// Other attributes
 		$cols = 2;
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -3033,7 +3077,7 @@ if ($action == 'create')
 																									  // modified by hook
 			if (empty($reshook))
 			{
-			    // Modify a validated invoice with no payments
+				// Modify a validated invoice with no payments
 				if ($object->statut == FactureFournisseur::STATUS_VALIDATED && $action != 'confirm_edit' && $object->getSommePaiement() == 0 && $usercancreate)
 				{
 					// We check if lines of invoice are not already transfered into accountancy
@@ -3078,17 +3122,17 @@ if ($action == 'create')
 					}
 				}
 
-	            // Make payments
-	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-	            {
-	                print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a></div>'; // must use facid because id is for payment id not invoice
-	            }
+				// Make payments
+				if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE && $action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="paiement.php?facid='.$object->id.'&amp;action=create'.($object->fk_account > 0 ? '&amp;accountid='.$object->fk_account : '').'">'.$langs->trans('DoPayment').'</a></div>'; // must use facid because id is for payment id not invoice
+				}
 
-	            // Classify paid
-	            if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
-	            {
-	                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
-	                print '>'.$langs->trans('ClassifyPaid').'</a></div>';
+				// Classify paid
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_VALIDATED && $object->paye == 0 && $user->socid == 0)
+				{
+					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid"';
+					print '>'.$langs->trans('ClassifyPaid').'</a></div>';
 
 					//print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
 				}
@@ -3124,21 +3168,21 @@ if ($action == 'create')
 					}
 				}
 
-	            // Validate
-	            if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT)
-	            {
-	                if (count($object->lines))
-	                {
+				// Validate
+				if ($action != 'confirm_edit' && $object->statut == FactureFournisseur::STATUS_DRAFT)
+				{
+					if (count($object->lines))
+					{
 						if ($usercanvalidate)
-	                    {
-	                        print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
-	                        print '>'.$langs->trans('Validate').'</a></div>';
-	                    } else {
-	                        print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
-	                        print '>'.$langs->trans('Validate').'</a></div>';
-	                    }
-	                }
-	            }
+						{
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid"';
+							print '>'.$langs->trans('Validate').'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'"';
+							print '>'.$langs->trans('Validate').'</a></div>';
+						}
+					}
+				}
 
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
@@ -3161,30 +3205,30 @@ if ($action == 'create')
 					}
 				}
 
-	            // Delete
+				// Delete
 				$isErasable = $object->is_erasable();
 				if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1)))	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
-	            {
-	            	//var_dump($isErasable);
-	            	if ($isErasable == -4) {
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
-	            	} elseif ($isErasable == -3) {	// Should never happen with supplier invoice
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	} elseif ($isErasable == -2) {	// Should never happen with supplier invoice
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
-	            	} elseif ($isErasable == -1) {
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
-	            	} elseif ($isErasable <= 0)	// Any other cases
-	            	{
-	            		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
-	            	} else {
-    	                print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
-                    }
-	            }
-	            print '</div>';
+				{
+					//var_dump($isErasable);
+					if ($isErasable == -4) {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -3) {	// Should never happen with supplier invoice
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -2) {	// Should never happen with supplier invoice
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable == -1) {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a></div>';
+					} elseif ($isErasable <= 0)	// Any other cases
+					{
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
+					}
+				}
+				print '</div>';
 
-	            if ($action != 'confirm_edit')
-	            {
+				if ($action != 'confirm_edit')
+				{
 					print '<div class="fichecenter"><div class="fichehalfleft">';
 
 					/*
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 39bb12c1ed1..f43ef300b01 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -94,56 +94,56 @@ if ($object->id > 0)
 
 	$totalpaye = $object->getSommePaiement();
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
-    $morehtmlref = '<div class="refidno">';
-    // Ref supplier
-    $morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
-    $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
-    // Thirdparty
-    $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
-    if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
-    // Project
-    if (!empty($conf->projet->enabled))
-    {
-    	$langs->load("projects");
-    	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-    	if ($user->rights->facture->creer)
-    	{
-    		if ($action != 'classify')
-    			//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-    			$morehtmlref .= ' : ';
-    		if ($action == 'classify') {
-    			//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-    			$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-    			$morehtmlref .= '<input type="hidden" name="action" value="classin">';
-    			$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-    			$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-    			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-    			$morehtmlref .= '</form>';
-    		} else {
-    			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-    		}
-    	} else {
-    		if (!empty($object->fk_project)) {
-    			$proj = new Project($db);
-    			$proj->fetch($object->fk_project);
-    			$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
-    			$morehtmlref .= $proj->ref;
-    			$morehtmlref .= '</a>';
-    		} else {
-    			$morehtmlref .= '';
-    		}
-    	}
-    }
-    $morehtmlref .= '</div>';
+	$morehtmlref = '<div class="refidno">';
+	// Ref supplier
+	$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0) $morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
+	// Project
+	if (!empty($conf->projet->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->facture->creer)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				$morehtmlref .= ' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
 
-    $object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
-    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
-    print '<div class="fichecenter">';
-    print '<div class="underbanner clearboth"></div>';
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
 
 	// Build file list
 	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
@@ -215,15 +215,15 @@ if ($object->id > 0)
 
 	// Amount Local Taxes
 	//TODO: Place into a function to control showing by country or study better option
-	if ($societe->localtax1_assuj == "1") //Localtax1
+	if ($mysoc->localtax1_assuj == "1") //Localtax1
 	{
-		print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
+		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
-	if ($societe->localtax2_assuj == "1") //Localtax2
+	if ($mysoc->localtax2_assuj == "1") //Localtax2
 	{
-		print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
+		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
 		print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
@@ -252,16 +252,14 @@ if ($object->id > 0)
 	$permission = $user->rights->fournisseur->facture->creer;
 	$permtoedit = $user->rights->fournisseur->facture->creer;
 	$param = '&facid='.$object->id;
-	
+
+	$defaulttpldir = '/core/tpl';
 	$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
 	foreach ($dirtpls as $module => $reldir)
 	{
-		if (!empty($module))
-		{
+		if (!empty($module)) {
 			$tpl = dol_buildpath($reldir.'/document_actions_post_headers.tpl.php');
-		}
-		else
-		{
+		} else {
 			$tpl = DOL_DOCUMENT_ROOT.$reldir.'/document_actions_post_headers.tpl.php';
 		}
 
@@ -272,9 +270,8 @@ if ($object->id > 0)
 		}
 		if ($res) break;
 	}
-	
 } else {
-    print $langs->trans('ErrorUnknown');
+	print $langs->trans('ErrorUnknown');
 }
 
 // End of page
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index df32ee1b19a..c3272544371 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -51,7 +51,7 @@ $maxOpenCount		= empty($conf->global->MAIN_MAXLIST_OVERLOAD) ? 500 : $conf->glob
 
 llxHeader("", $langs->trans("SupplierInvoicesArea"), 'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
 
-print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'invoicing');
+print load_fiche_titre($langs->trans("SupplierInvoicesArea"), '', 'bill');
 
 print '<div class="fichecenter">';
 
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 66e94d461a4..ff2da87d716 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -67,7 +67,7 @@ if ($user->socid > 0)
 	$socid = $user->socid;
 }
 
-$mode = GETPOST("mode");
+$mode = GETPOST("mode", 'aZ09');
 
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_label = GETPOST("search_label", "alpha");
@@ -92,6 +92,7 @@ $search_multicurrency_montant_vat = GETPOST('search_multicurrency_montant_vat',
 $search_multicurrency_montant_ttc = GETPOST('search_multicurrency_montant_ttc', 'alpha');
 $search_status = GETPOST('search_status', 'int');
 $search_paymentmode = GETPOST('search_paymentmode', 'int');
+$search_paymentcond = GETPOST('search_paymentcond', 'int');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state");
@@ -165,7 +166,8 @@ $arrayfields = array(
 	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
 	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0),
 	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers),
-	'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1),
+	'f.fk_cond_reglement'=>array('label'=>$langs->trans("PaymentTerm"), 'checked'=>1, 'position'=>50),
+	'f.fk_mode_reglement'=>array('label'=>$langs->trans("PaymentMode"), 'checked'=>1, 'position'=>52),
 	'f.total_ht'=>array('label'=>$langs->trans("AmountHT"), 'checked'=>1, 'position'=>105),
 	'f.total_vat'=>array('label'=>$langs->trans("AmountVAT"), 'checked'=>0, 'position'=>110),
 	'f.total_localtax1'=>array('label'=>$langs->transcountry("AmountLT1", $mysoc->country_code), 'checked'=>0, 'enabled'=>$mysoc->localtax1_assuj == "1", 'position'=>95),
@@ -240,6 +242,7 @@ if (empty($reshook))
 		$search_multicurrency_montant_ttc = '';
 		$search_status = '';
 		$search_paymentmode = '';
+		$search_paymentcond = '';
 		$search_town = '';
 		$search_zip = "";
 		$search_state = "";
@@ -367,7 +370,8 @@ if ($search_multicurrency_montant_vat != '') $sql .= natural_search('f.multicurr
 if ($search_multicurrency_montant_ttc != '') $sql .= natural_search('f.multicurrency_total_ttc', $search_multicurrency_montant_ttc, 1);
 if ($search_login) $sql .= natural_search('u.login', $search_login);
 if ($search_status != '' && $search_status >= 0) $sql .= " AND f.fk_statut = ".$db->escape($search_status);
-if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".$search_paymentmode."";
+if ($search_paymentmode > 0) $sql .= " AND f.fk_mode_reglement = ".((int) $search_paymentmode);
+if ($search_paymentcond > 0) $sql .= " AND f.fk_cond_reglement = ".((int) $search_paymentcond);
 $sql .= dolSqlDateFilter("f.datef", $day, $month, $year);
 $sql .= dolSqlDateFilter("f.date_lim_reglement", $day_lim, $month_lim, $year_lim);
 if ($option == 'late') $sql .= " AND f.date_lim_reglement < '".$db->idate(dol_now() - $conf->facture->fournisseur->warning_delay)."'";
@@ -385,7 +389,7 @@ if ($filter && $filter != -1)
 		$sql .= ' AND '.$db->escape(trim($filt[0])).' = '.$db->escape(trim($filt[1]));
 	}
 }
-if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$db->escape($search_sale);
+if ($search_sale > 0) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 if ($search_user > 0)
 {
 	$sql .= " AND ec.fk_c_type_contact = tc.rowid AND tc.element='invoice_supplier' AND tc.source='internal' AND ec.element_id = f.rowid AND ec.fk_socpeople = ".$search_user;
@@ -595,7 +599,7 @@ if ($resql)
 	 	$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -720,11 +724,18 @@ if ($resql)
 		print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
 		print '</td>';
 	}
+	// Condition of payment
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
+	{
+		print '<td class="liste_titre left">';
+		$form->select_conditions_paiements($search_paymentcond, 'search_paymentcond', -1, 1, 1, 'maxwidth100');
+		print '</td>';
+	}
 	// Payment mode
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 	{
 		print '<td class="liste_titre left">';
-		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 10);
+		$form->select_types_paiements($search_paymentmode, 'search_paymentmode', '', 0, 1, 1, 20, 1, 'maxwidth100');
 		print '</td>';
 	}
 	if (!empty($arrayfields['f.total_ht']['checked']))
@@ -848,7 +859,7 @@ if ($resql)
 	{
 		print '<td class="liste_titre maxwidthonsmartphone right">';
 		$liststatus = array('0'=>$langs->trans("Draft"), '1'=>$langs->trans("Unpaid"), '2'=>$langs->trans("Paid"));
-		print $form->selectarray('search_status', $liststatus, $search_status, 1);
+		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td>';
 	}
 	// Action column
@@ -873,6 +884,7 @@ if ($resql)
 	if (!empty($arrayfields['state.nom']['checked']))            print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
 	if (!empty($arrayfields['country.code_iso']['checked']))     print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
 	if (!empty($arrayfields['typent.code']['checked']))          print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER["PHP_SELF"], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_cond_reglement", "", $param, "", $sortfield, $sortorder);
 	if (!empty($arrayfields['f.fk_mode_reglement']['checked']))  print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER["PHP_SELF"], "f.fk_mode_reglement", "", $param, "", $sortfield, $sortorder);
 	if (!empty($arrayfields['f.total_ht']['checked']))           print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], 'f.total_ht', '', $param, '', $sortfield, $sortorder, 'right ');
 	if (!empty($arrayfields['f.total_vat']['checked']))          print_liste_field_titre($arrayfields['f.total_vat']['label'], $_SERVER['PHP_SELF'], 'f.tva', '', $param, '', $sortfield, $sortorder, 'right ');
@@ -1096,6 +1108,14 @@ if ($resql)
 				if (!$i) $totalarray['nbfield']++;
 			}
 
+			// Payment condition
+			if (!empty($arrayfields['f.fk_cond_reglement']['checked']))
+			{
+				print '<td>';
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', '', -1);
+				print '</td>';
+				if (!$i) $totalarray['nbfield']++;
+			}
 			// Payment mode
 			if (!empty($arrayfields['f.fk_mode_reglement']['checked']))
 			{
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 65b8936a592..bd5950151eb 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -245,7 +245,7 @@ if (empty($reshook))
 	    {
 	        $action = 'create';
 	    }
-	    // Le reste propre a cette action s'affiche en bas de page.
+	    // All the next of this action is displayed at the page's bottom.
 	}
 
 
@@ -292,7 +292,7 @@ if (empty($reshook))
 	        $thirdparty = new Societe($db);
             if ($socid > 0) $thirdparty->fetch($socid);
 
-	        // Creation de la ligne paiement
+	        // Creation of payment line
 	        $paiement = new PaiementFourn($db);
 	        $paiement->datepaye     = $datepaye;
 	        $paiement->amounts      = $amounts; // Array of amounts
@@ -521,7 +521,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	            $sql .= " WHERE f.entity = ".$conf->entity;
 	            $sql .= ' AND f.fk_soc = '.$object->socid;
 	            $sql .= ' AND f.paye = 0';
-	            $sql .= ' AND f.fk_statut = 1'; // Statut=0 => non validee, Statut=2 => annulee
+	            $sql .= ' AND f.fk_statut = 1'; // Status=0 => unvalidated, Status=2 => canceled
 	            if ($object->type != FactureFournisseur::TYPE_CREDIT_NOTE)
 	            {
 	                $sql .= ' AND f.type IN (0,1,3,5)'; // Standard invoice, replacement, deposit, situation
@@ -756,7 +756,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 	            }
 			}
 
-	        // Bouton Enregistrer
+	        // Save Button
 	        if ($action != 'add_paiement')
 	        {
 				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
@@ -787,255 +787,6 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
     } else dol_print_error($db);
 }
 
-/*
- * Show list
- */
-if (empty($action) || $action == 'list')
-{
-    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-    $sortfield = GETPOST("sortfield", 'alpha');
-    $sortorder = GETPOST("sortorder", 'alpha');
-    $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-    if (empty($page) || $page == -1) { $page = 0; }
-    $offset = $limit * $page;
-    $pageprev = $page - 1;
-    $pagenext = $page + 1;
-    if (!$sortorder) $sortorder = 'DESC';
-    if (!$sortfield) $sortfield = 'p.datep';
-
-    $sql = 'SELECT p.rowid as pid, p.ref, p.datep as dp, p.amount as pamount, p.num_paiement,';
-    $sql .= ' s.rowid as socid, s.nom as name,';
-    $sql .= ' c.code as paiement_type, c.libelle as paiement_libelle,';
-    $sql .= ' ba.rowid as bid, ba.label,';
-    if (!$user->rights->societe->client->voir) $sql .= ' sc.fk_soc, sc.fk_user,';
-    $sql .= ' SUM(pf.amount)';
-    $sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
-    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
-    if (!$user->rights->societe->client->voir) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-    $sql .= " WHERE f.entity = ".$conf->entity;
-    if (!$user->rights->societe->client->voir) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-    if ($socid > 0) $sql .= ' AND f.fk_soc = '.$socid;
-    $sql .= dolSqlDateFilter('p.datep', $day, $month, $year);
-    if ($search_ref)       		    $sql .= natural_search('p.rowid', $search_ref);
-    if ($search_account > 0)      	$sql .= " AND b.fk_account=".$search_account;
-    if ($search_paymenttype != "")  $sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
-    if ($search_payment_num != '')  $sql .= natural_search('p.num_paiement', $search_payment_num);
-    if ($search_amount)      		$sql .= natural_search('p.amount', $search_amount, 1);
-    if ($search_company)     		$sql .= natural_search('s.nom', $search_company);
-    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
-    $sql .= " GROUP BY p.rowid, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, c.code, c.libelle, ba.rowid, ba.label";
-    if (!$user->rights->societe->client->voir) $sql .= ", sc.fk_soc, sc.fk_user";
-    // Add where from extra fields
-
-    $sql .= $db->order($sortfield, $sortorder);
-
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
-
-    $sql .= $db->plimit($limit + 1, $offset);
-
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-        $i = 0;
-
-        $param = '';
-        if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-        if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-        if ($day)                   $param .= ($day ? "&day=".urlencode($day) : "");
-        if ($month)                 $param .= ($month ? "&month=".urlencode($month) : "");
-        if ($year)                  $param .= ($year ? "&year=".urlencode($year) : "");
-        if ($search_ref)            $param .= ($search_ref ? "&search_ref=".urlencode($search_ref) : "");
-        if ($search_company)        $param .= ($search_company ? "&search_company=".urlencode($search_company) : "");
-        if ($search_amount != '')   $param .= ($search_amount ? "&search_amount=".urlencode($search_amount) : "");
-        if ($search_payment_num)    $param .= ($search_payment_num ? "&search_payment_num=".urlencode($search_payment_num) : "");
-    	if ($optioncss != '')       $param .= '&optioncss='.urlencode($optioncss);
-    	// Add $param from extra fields
-    	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
-
-    	$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
-
-        print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-        if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="action" value="list">';
-        print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-        print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-        print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-        print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'supplier_invoice', 0, '', '', $limit, 0, 0, 1);
-
-        $moreforfilter = '';
-
-        $parameters = array();
-        $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-    	if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
-    	else $moreforfilter = $hookmanager->resPrint;
-
-        if ($moreforfilter)
-        {
-       		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-            print $moreforfilter;
-            print '</div>';
-        }
-
-        $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-        $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-
-        print '<div class="div-table-responsive">';
-        print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-        // Lines for filters fields
-        print '<tr class="liste_titre_filter">';
-        print '<td  class="liste_titre left">';
-        print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
-        print '</td>';
-        print '<td class="liste_titre center">';
-        if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="day" value="'.dol_escape_htmltag($day).'">';
-        print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="month" value="'.dol_escape_htmltag($month).'">';
-        $formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
-        print '</td>';
-        print '<td class="liste_titre">';
-        print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
-        print '</td>';
-        print '<td class="liste_titre">';
-        $form->select_types_paiements($search_paymenttype, 'search_paymenttype', '', 2, 1, 1);
-        print '</td>';
-        print '<td class="liste_titre">';
-        print '<input class="flat" type="text" size="4" name="search_payment_num" value="'.dol_escape_htmltag($search_payment_num).'">';
-        print '</td>';
-        if (!empty($conf->banque->enabled))
-        {
-            print '<td class="liste_titre">';
-	        $form->select_comptes($search_account, 'search_account', 0, '', 1);
-	        print '</td>';
-        }
-        print '<td class="liste_titre right">';
-        print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
-        print '</td>';
-        print '<td class="liste_titre maxwidthsearch">';
-        $searchpicto = $form->showFilterAndCheckAddButtons(0);
-        print $searchpicto;
-        print '</td>';
-        print "</tr>\n";
-
-        print '<tr class="liste_titre">';
-        print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Date", $_SERVER["PHP_SELF"], 'dp', '', $param, '', $sortfield, $sortorder, 'center ');
-        print_liste_field_titre("ThirdParty", $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Type", $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
-        print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "p.num_paiement", "", $param, "", $sortfield, $sortorder);
-        if (!empty($conf->banque->enabled))
-        {
-            print_liste_field_titre("Account", $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
-        }
-        print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
-
-        $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('', $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
-        print "</tr>\n";
-
-        $paymentfournstatic = new PaiementFourn($db);
-
-        $i = 0;
-        $totalarray = array();
-        while ($i < min($num, $limit))
-        {
-            $objp = $db->fetch_object($resql);
-
-            $paymentfournstatic->id = $objp->pid;
-            $paymentfournstatic->ref = $objp->ref;
-            $paymentfournstatic->datepaye = $objp->dp;
-
-            print '<tr class="oddeven">';
-
-            // Ref payment
-            print '<td class="nowrap">';
-            print $paymentfournstatic->getNomUrl(1);
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Date
-            $dateformatforpayment = 'day';
-            if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
-            print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->dp), $dateformatforpayment)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-
-            // Thirdparty
-            print '<td>';
-            if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.dol_trunc($objp->name, 32).'</a>';
-            else print '&nbsp;';
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Type
-            $payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
-            print '<td>'.$payment_type.' '.dol_trunc($objp->num_paiement, 32)."</td>\n";
-            if (!$i) $totalarray['nbfield']++;
-
-            // Payment number
-            print '<td>'.$objp->num_paiement.'</td>';
-            if (!$i) $totalarray['nbfield']++;
-
-            // Account
-            if (!empty($conf->banque->enabled))
-            {
-                print '<td>';
-	            if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
-    	        else print '&nbsp;';
-        	    print '</td>';
-            	if (!$i) $totalarray['nbfield']++;
-            }
-
-            // Amount
-            print '<td class="right">'.price($objp->pamount).'</td>';
-            if (!$i) $totalarray['nbfield']++;
-            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'amount';
-            $totalarray['val']['amount'] += $objp->pamount;
-
-            // Ref invoice
-            /*$invoicesupplierstatic->ref=$objp->ref_supplier;
-            $invoicesupplierstatic->id=$objp->facid;
-            print '<td class="nowrap">';
-            print $invoicesupplierstatic->getNomUrl(1);
-            print '</td>';*/
-
-			print '<td></td>';
-			if (!$i) $totalarray['nbfield']++;
-
-            print '</tr>';
-            $i++;
-        }
-
-        // Show total line
-        include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-        print "</table>";
-        print "</div>";
-        print "</form>\n";
-    } else {
-        dol_print_error($db);
-    }
-}
-
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index ffe4c95bf51..9d842481188 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -74,7 +74,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 	if ($result > 0)
 	{
 		$db->commit();
-		header('Location: '.DOL_URL_ROOT.'/fourn/facture/paiement.php');
+		header('Location: '.DOL_URL_ROOT.'/fourn/paiement/list.php');
 		exit;
 	} else {
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -82,7 +82,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->fournisse
 	}
 }
 
-if ($action == 'confirm_valide' && $confirm == 'yes' &&
+if ($action == 'confirm_validate' && $confirm == 'yes' &&
 	((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
 	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
 )
@@ -90,7 +90,7 @@ if ($action == 'confirm_valide' && $confirm == 'yes' &&
 	$db->begin();
 
 	$object->fetch($id);
-	if ($object->valide() >= 0)
+	if ($object->validate() >= 0)
 	{
 		$db->commit();
 		header('Location: '.$_SERVER['PHP_SELF'].'?id='.$object->id);
@@ -128,7 +128,7 @@ if ($action == 'setdatep' && !empty($_POST['datepday']))
 
 // Build document
 $upload_dir = $conf->fournisseur->payment->dir_output;
-// TODO: get the appropriate permisson
+// TODO: get the appropriate permission
 $permissiontoadd = true;
 include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
@@ -151,7 +151,7 @@ dol_fiche_head($head, 'payment', $langs->trans('SupplierPayment'), -1, 'payment'
 if ($result > 0)
 {
 	/*
-	 * Confirmation de la suppression du paiement
+	 * Confirmation of payment's delete
 	 */
 	if ($action == 'delete')
 	{
@@ -159,14 +159,14 @@ if ($result > 0)
 	}
 
 	/*
-	 * Confirmation de la validation du paiement
+	 * Confirmation of payment's validation
 	 */
-	if ($action == 'valide')
+	if ($action == 'validate')
 	{
-		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide');
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_validate');
 	}
 
-	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/paiement.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/paiement/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref');
@@ -181,7 +181,7 @@ if ($result > 0)
     print $form->showrefnav($object,'id','',1,'rowid','ref');
 	print '</td></tr>';*/
 
-	// Date payment
+	// Date of payment
 	print '<tr><td class="titlefield" colspan="2">'.$form->editfieldkey("Date", 'datep', $object->date, $object, $object->statut == 0 && $user->rights->fournisseur->facture->creer).'</td><td colspan="3">';
 	print $form->editfieldval("Date", 'datep', $object->date, $object, $object->statut == 0 && $user->rights->fournisseur->facture->creer, 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'));
 	print '</td></tr>';
@@ -251,9 +251,10 @@ if ($result > 0)
 	print '<br>';
 
 	/**
-	 *	Liste des factures
+	 *	List of seller's invoices
 	 */
-	$sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom as name, s.rowid as socid';
+	$sql = 'SELECT f.rowid, f.rowid as facid, f.ref, f.ref_supplier, f.type, f.paye, f.total_ht, f.total_tva, f.total_ttc, f.datef as date, f.fk_statut as status,';
+	$sql .= ' pf.amount, s.nom as name, s.rowid as socid';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
 	$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
 	$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
@@ -285,6 +286,13 @@ if ($result > 0)
 
 				$facturestatic->id = $objp->facid;
 				$facturestatic->ref = ($objp->ref ? $objp->ref : $objp->rowid);
+				$facturestatic->date = $db->jdate($objp->date);
+				$facturestatic->type = $objp->type;
+				$facturestatic->total_ht = $objp->total_ht;
+				$facturestatic->total_tva = $objp->total_tva;
+				$facturestatic->total_ttc = $objp->total_ttc;
+				$facturestatic->statut = $objp->status;
+				$facturestatic->alreadypaid = -1;	// unknown
 
 				print '<tr class="oddeven">';
 				// Ref
@@ -300,7 +308,7 @@ if ($result > 0)
 				// Payed
 				print '<td class="right">'.price($objp->amount).'</td>';
 				// Status
-				print '<td class="right">'.$facturestatic->LibStatut($objp->paye, $objp->fk_statut, 6, 1).'</td>';
+				print '<td class="right">'.$facturestatic->LibStatut($objp->paye, $objp->status, 6, 1).'</td>';
 				print "</tr>\n";
 
 				if ($objp->paye == 1)
@@ -324,7 +332,7 @@ if ($result > 0)
 
 
 	/*
-	 * Boutons Actions
+	 * Actions Buttons
 	 */
 
 	print '<div class="tabsAction">';
@@ -335,7 +343,7 @@ if ($result > 0)
 			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->facture->creer))
 		   	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_invoice_advance->validate)))
 			{
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Valid').'</a>';
 			}
 		}
 	}
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
new file mode 100644
index 00000000000..0310a75fe57
--- /dev/null
+++ b/htdocs/fourn/paiement/list.php
@@ -0,0 +1,446 @@
+<?php
+/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
+ * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
+ * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2018		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file		htdocs/fourn/paiment/list.php
+*	\ingroup	fournisseur,facture
+ *	\brief		Payment list for supplier invoices
+ */
+
+require '../../main.inc.php';
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+
+// doesn't work :-(
+// restrictedArea($user, 'fournisseur');
+
+// doesn't work :-(
+// require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+// $object = new PaiementFourn($db);
+// restrictedArea($user, $object->element);
+
+if (!$user->rights->fournisseur->facture->lire) {
+	accessforbidden();
+}
+
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
+
+$action					= GETPOST('action', 'alpha');
+$massaction				= GETPOST('massaction', 'alpha');
+$optioncss				= GETPOST('optioncss', 'alpha');
+$contextpage			= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
+
+$socid					= GETPOST('socid', 'int');
+
+$search_ref				= GETPOST('search_ref', 'alpha');
+$search_day				= GETPOST('search_day', 'int');
+$search_month			= GETPOST('search_month', 'int');
+$search_year			= GETPOST('search_year', 'int');
+$search_company			= GETPOST('search_company', 'alpha');
+$search_payment_type	= GETPOST('search_payment_type');
+$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
+$search_bank_account	= GETPOST('search_bank_account', 'int');
+$search_amount			= GETPOST('search_amount', 'alpha');		// alpha because we must be able to search on '< x'
+
+$limit					= GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield				= GETPOST('sortfield', 'alpha');
+$sortorder				= GETPOST('sortorder', 'alpha');
+$page					= GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+
+if (empty($page) || $page == -1) $page = 0;		// If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "p.datep";
+
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOSTISSET("search_all", 'alpha') : GETPOST('sall'));
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'p.ref'=>"RefPayment",
+	's.nom'=>"ThirdParty",
+	'p.num_paiement'=>"Numero",
+	'p.amount'=>"Amount",
+);
+
+$arrayfields = array(
+	'p.ref'				=>array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
+	'p.datep'			=>array('label'=>"Date", 'checked'=>1, 'position'=>20),
+	's.nom'				=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
+	'c.libelle'			=>array('label'=>"Type", 'checked'=>1, 'position'=>40),
+	'p.num_paiement'	=>array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
+	'ba.label'			=>array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enable'=>(!empty($conf->banque->enabled))),
+	'p.amount'			=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('paymentsupplierlist'));
+$object = new PaiementFourn($db);
+
+/*
+* Actions
+*/
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {	// All tests are required to be compatible with all browsers
+		$search_ref = '';
+		$search_day = '';
+		$search_month = '';
+		$search_year = '';
+		$search_company = '';
+		$search_payment_type = '';
+		$search_cheque_num = '';
+		$search_bank_account = '';
+		$search_amount = '';
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans('ListPayment'));
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$companystatic = new Societe($db);
+$paymentfournstatic = new PaiementFourn($db);
+
+$sql = 'SELECT p.rowid, p.ref, p.datep, p.amount as pamount, p.num_paiement';
+$sql .= ', s.rowid as socid, s.nom as name, s.email';
+$sql .= ', c.code as paiement_type, c.libelle as paiement_libelle';
+$sql .= ', ba.rowid as bid, ba.label';
+if (!$user->rights->societe->client->voir) $sql .= ', sc.fk_soc, sc.fk_user';
+$sql .= ', SUM(pf.amount)';
+
+$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn AS p';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'paiementfourn_facturefourn AS pf ON p.rowid=pf.fk_paiementfourn';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn AS f ON f.rowid=pf.fk_facturefourn';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON p.fk_paiement = c.id';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON s.rowid = f.fk_soc';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+if (!$user->rights->societe->client->voir) $sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+
+$sql .= ' WHERE f.entity = '.$conf->entity;
+if (!$user->rights->societe->client->voir) $sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '.$user->id;
+if ($socid > 0) $sql .= ' AND f.fk_soc = '.$socid;
+if ($search_ref)				$sql .= natural_search('p.ref', $search_ref);
+$sql .= dolSqlDateFilter('p.datep', $search_day, $search_month, $search_year);
+if ($search_company)			$sql .= natural_search('s.nom', $search_company);
+if ($search_payment_type != '')	$sql .= " AND c.code='".$db->escape($search_payment_type)."'";
+if ($search_cheque_num != '')	$sql .= natural_search('p.num_paiement', $search_cheque_num);
+if ($search_amount)				$sql .= natural_search('p.amount', $search_amount, 1);
+if ($search_bank_account > 0)	$sql .= ' AND b.fk_account='.$search_bank_account."'";
+
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+
+$sql .= ' GROUP BY p.rowid, p.datep, p.amount, p.num_paiement, s.rowid, s.nom, c.code, c.libelle, ba.rowid, ba.label';
+if (!$user->rights->societe->client->voir) $sql .= ', sc.fk_soc, sc.fk_user';
+
+$sql .= $db->order($sortfield, $sortorder);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords) {		// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
+}
+
+$num = $db->num_rows($resql);
+$i = 0;
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+if ($optioncss != '')		$param .= '&optioncss='.urlencode($optioncss);
+
+if ($search_ref)			$param .= '&search_ref='.urlencode($search_ref);
+if ($saerch_day)			$param .= '&search_day='.urlencode($search_day);
+if ($saerch_month)			$param .= '&search_month='.urlencode($search_month);
+if ($search_year)			$param .= '&search_year='.urlencode($search_year);
+if ($search_company)		$param .= '&search_company='.urlencode($search_company);
+if ($search_payment_type)	$param .= '&search_company='.urlencode($search_payment_type);
+if ($search_cheque_num)		$param .= '&search_cheque_num='.urlencode($search_cheque_num);
+if ($search_amount)			$param .= '&search_amount='.urlencode($search_amount);
+
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($langs->trans('SupplierPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'supplier_invoice', 0, '', '', $limit, 0, 0, 1);
+
+if ($search_all)
+{
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if ($moreforfilter) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if ($massactionbutton) $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+
+print '<tr class="liste_titre_filter">';
+
+// Filter: Ref
+if (!empty($arrayfields['p.ref']['checked'])) {
+	print '<td  class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['p.datep']['checked'])) {
+	print '<td class="liste_titre center">';
+	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_day" value="'.dol_escape_htmltag($search_day).'">';
+	print '<input class="flat width25 valignmiddle" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
+	$formother->select_year($search_year ? $search_year : -1, 'search_year', 1, 20, 5);
+	print '</td>';
+}
+
+// Filter: Thirdparty
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="6" name="search_company" value="'.dol_escape_htmltag($search_company).'">';
+	print '</td>';
+}
+
+// Filter: Payment type
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_types_paiements($search_payment_type, 'search_payment_type', '', 2, 1, 1);
+	print '</td>';
+}
+
+// Filter: Cheque number (fund transfer)
+if (!empty($arrayfields['p.num_paiement']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_cheque_num" value="'.dol_escape_htmltag($search_cheque_num).'">';
+	print '</td>';
+}
+
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_bank_account, 'search_bank_account', 0, '', 1);
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['p.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Buttons
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print '</tr>';
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST))	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.ref']['checked']))				print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.rowid', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.datep']['checked']))				print_liste_field_titre($arrayfields['p.datep']['label'], $_SERVER["PHP_SELF"], 'p.datep', '', $param, '', $sortfield, $sortorder, 'center ');
+if (!empty($arrayfields['s.nom']['checked']))				print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['c.libelle']['checked']))			print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.num_paiement']['checked']))		print_liste_field_titre($arrayfields['p.num_paiement']['label'], $_SERVER["PHP_SELF"], "p.num_paiement", '', $param, '', $sortfield, $sortorder, '', $arrayfields['p.num_paiement']['tooltip']);
+if (!empty($arrayfields['ba.label']['checked']))			print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+if (!empty($arrayfields['p.amount']['checked']))			print_liste_field_titre($arrayfields['p.amount']['label'], $_SERVER["PHP_SELF"], 'p.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+
+// Hook fields
+$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'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print '</tr>';
+
+$checkedCount = 0;
+foreach ($arrayfields as $column) {
+	if ($column['checked']) {
+		$checkedCount++;
+	}
+}
+
+$i = 0;
+$totalarray = array();
+while ($i < min($num, $limit)) {
+	$objp = $db->fetch_object($resql);
+
+	$paymentfournstatic->id = $objp->rowid;
+	$paymentfournstatic->ref = $objp->ref;
+	$paymentfournstatic->datepaye = $objp->datep;
+
+	$companystatic->id = $objp->socid;
+	$companystatic->name = $objp->name;
+	$companystatic->email = $objp->email;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Ref
+	if (!empty($arrayfields['p.ref']['checked'])) {
+		print '<td class="nowrap">'.$paymentfournstatic->getNomUrl(1).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Date
+	if (!empty($arrayfields['p.datep']['checked'])) {
+		$dateformatforpayment = 'day';
+		if (!empty($conf->global->INVOICE_USE_HOURS_FOR_PAYMENT)) $dateformatforpayment = 'dayhour';
+		print '<td class="nowrap center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Thirdparty
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td>';
+		if ($objp->socid > 0) {
+			print $companystatic->getNomUrl(1, '', 24);
+		}
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Pyament type
+	if (!empty($arrayfields['c.libelle']['checked'])) {
+		$payment_type = $langs->trans("PaymentType".$objp->paiement_type) != ("PaymentType".$objp->paiement_type) ? $langs->trans("PaymentType".$objp->paiement_type) : $objp->paiement_libelle;
+		print '<td>'.$payment_type.' '.dol_trunc($objp->num_paiement, 32).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Cheque number (fund transfer)
+	if (!empty($arrayfields['p.num_paiement']['checked'])) {
+		print '<td>'.$objp->num_paiement.'</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Account
+	if (!empty($arrayfields['ba.label']['checked']))
+	{
+		print '<td>';
+		if ($objp->bid) print '<a href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?account='.$objp->bid.'">'.img_object($langs->trans("ShowAccount"), 'account').' '.dol_trunc($objp->label, 24).'</a>';
+		else print '&nbsp;';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
+	}
+
+	// Amount
+	if (!empty($arrayfields['p.amount']['checked'])) {
+		print '<td class="right">'.price($objp->pamount).'</td>';
+		if (!$i) $totalarray['nbfield']++;
+		$totalarray['pos'][$checkedCount] = 'amount';
+		$totalarray['val']['amount'] += $objp->pamount;
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>';
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print '</table>';
+print '</div>';
+print '</form>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index d9bbe6607bf..47f7744c5ae 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -82,7 +82,8 @@ if (($id > 0) || $ref)
 }
 
 $cancreate = 0;
-if (!empty($user->rights->holiday->write_all)) $cancreate = 1;
+
+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance)) $cancreate = 1;
 if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) $cancreate = 1;
 
 $candelete = 0;
@@ -146,12 +147,26 @@ if (empty($reshook))
 			$valideur = GETPOST('valideur', 'int');
 			$description = trim(GETPOST('description', 'restricthtml'));
 
+			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
+			if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->creer)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->expensereport->writeall_advance))) {
+				$error++;
+				setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
+			} else {
+				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
+					if (! in_array($fuserid, $childids)) {
+						$error++;
+						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+						$action = 'create';
+					}
+				}
+			}
+
 			// If no type
 			if ($type <= 0)
 			{
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 
 			// If no start date
@@ -159,21 +174,21 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 			// If no end date
 			if (empty($date_fin))
 			{
 				setEventMessages($langs->trans("NoDateFin"), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 			// If start date after end date
 			if ($date_debut > $date_fin)
 			{
 				setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 
 			// Check if there is already holiday for this period
@@ -182,16 +197,16 @@ if (empty($reshook))
 			{
 				setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 
 			// If there is no Business Days within request
 			$nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
 			if ($nbopenedday < 0.5)
 			{
-				setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');
+				setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors');		// No working day
 				$error++;
-				$action = 'add';
+				$action = 'create';
 			}
 
 			// If no validator designated
@@ -741,7 +756,8 @@ if (empty($reshook))
 		$object->fetch($id);
 
 		// Si statut en attente de validation et valideur = valideur ou utilisateur, ou droits de faire pour les autres
-		if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || !empty($user->rights->holiday->write_all)))
+		if (($object->statut == Holiday::STATUS_VALIDATED || $object->statut == Holiday::STATUS_APPROVED) && ($user->id == $object->fk_validator || in_array($object->fk_user, $childids)
+			|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))))
 		{
 			$db->begin();
 
@@ -866,15 +882,15 @@ llxHeader('', $langs->trans('CPTitreMenu'));
 
 if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 {
-	// Si l'utilisateur n'a pas le droit de faire une demande
-	if (($fuserid == $user->id && empty($user->rights->holiday->write)) || ($fuserid != $user->id && empty($user->rights->holiday->write_all)))
+	// If user has no permission to create a leave
+	if ((in_array($fuserid, $childids) && empty($user->rights->holiday->write)) || (!in_array($fuserid, $childids) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))))
 	{
 		$errors[] = $langs->trans('CantCreateCP');
 	} else {
-		// Formulaire de demande de congés payés
+		// Form to add a leave request
 		print load_fiche_titre($langs->trans('MenuAddCP'), '', 'title_hrm.png');
 
-		// Si il y a une erreur
+		// Error management
 		if (GETPOST('error')) {
 			switch (GETPOST('error')) {
 				case 'datefin' :
@@ -981,11 +997,13 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 		print '<td class="titlefield fieldrequired">'.$langs->trans("User").'</td>';
 		print '<td>';
 
-		if (empty($user->rights->holiday->write_all))
+		if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance))
 		{
 			print $form->select_dolusers(($fuserid ? $fuserid : $user->id), 'fuserid', 0, '', 0, 'hierarchyme', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
 			//print '<input type="hidden" name="fuserid" value="'.($fuserid?$fuserid:$user->id).'">';
-		} else print $form->select_dolusers(GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+		} else {
+			print $form->select_dolusers(GETPOST('fuserid', 'int') ? GETPOST('fuserid', 'int') : $user->id, 'fuserid', 0, '', 0, '', '', '0,'.$conf->entity, 0, 0, $morefilter, 0, '', 'maxwidth300');
+		}
 		print '</td>';
 		print '</tr>';
 
@@ -1459,7 +1477,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add')
 							print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("NotTheAssignedApprover").'">'.$langs->trans("ActionRefuseCP").'</a>';
 						}
 					}
-					if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || !empty($user->rights->holiday->write_all)) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
+					if (($user->id == $object->fk_validator || in_array($object->fk_user, $childids) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))) && ($object->statut == 2 || $object->statut == 3))	// Status validated or approved
 					{
 						if (($object->date_debut > dol_now()) || $user->admin) print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel" class="butAction">'.$langs->trans("ActionCancelCP").'</a>';
 						else print '<a href="#" class="butActionRefused classfortooltip" title="'.$langs->trans("HolidayStarted").'">'.$langs->trans("ActionCancelCP").'</a>';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index ca83d9341f2..0cd0489c701 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -421,7 +421,7 @@ if ($resql)
 
 		print '<div class="tabsAction">';
 
-		$canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && $user->rights->holiday->write_all));
+		$canedit = (($user->id == $user_id && $user->rights->holiday->write) || ($user->id != $user_id && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->holiday->writeall_advance))));
 
 		if ($canedit)
 		{
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index baf444ce295..7e7e7ed29f9 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -48,7 +48,10 @@ $massaction  = GETPOST('massaction', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ');
 $optioncss   = GETPOST('optioncss', 'aZ');
 
-$search_ref   = GETPOST('search_ref', 'alpha');
+$search_ref         = GETPOST('search_ref', 'alphanohtml');
+$search_employee    = GETPOST('search_employee', 'int');
+$search_type        = GETPOST('search_type', 'int');
+$search_description = GETPOST('search_description', 'alphanohtml');
 
 $limit       = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield   = GETPOST('sortfield', 'aZ09comma');
@@ -82,6 +85,9 @@ if (empty($reshook))
     if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
     {
         $search_ref = '';
+        $search_employee = '';
+        $search_type = '';
+        $search_description = '';
         $toselect = '';
         $search_array_options = array();
     }
@@ -135,7 +141,10 @@ $sql.= " WHERE cp.rowid > 0";
 $sql.= " AND cp.statut = 3"; // 3 = Approved
 $sql.= " AND (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
 
-if ($search_ref != '') $sql.= natural_search('cp.ref', $search_ref, 0);
+if (!empty($search_ref))            $sql .= natural_search('cp.ref', $search_ref);
+if (!empty($search_employee))       $sql .= " AND cp.fk_user = '".$db->escape($search_employee)."'";
+if (!empty($search_type))           $sql .= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
+if (!empty($search_description))    $sql.= natural_search('cp.description', $search_description);
 
 $sql.= $db->order($sortfield, $sortorder);
 
@@ -149,9 +158,12 @@ if (empty($resql))
 $num = $db->num_rows($resql);
 
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param.= '&limit='.urlencode($limit);
-if ($search_ref) $param = '&search_ref='.urlencode($search_ref);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])   $param.= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit)                     $param .= '&limit='.urlencode($limit);
+if (!empty($search_ref))                                            $param .= '&search_ref='.urlencode($search_ref);
+if (!empty($search_employee))                                       $param .= '&search_employee='.urlencode($search_employee);
+if (!empty($search_type))                                           $param .= '&search_type='.urlencode($search_type);
+if (!empty($search_description))                                    $param .= '&search_description='.urlencode($search_description);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -184,16 +196,50 @@ print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-if (!empty($arrayfields['cp.ref']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth100" name="search_ref" value="'.$search_ref.'"></td>';
-if (!empty($arrayfields['cp.fk_user']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['ct.label']['checked'])) print '<td class="liste_titre"></td>';
+
+// Filter: Ref
+if (!empty($arrayfields['cp.ref']['checked'])) {
+    print '<td class="liste_titre">';
+    print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+    print '</td>';
+}
+
+// Filter: Employee
+if (!empty($arrayfields['cp.fk_user']['checked'])) {
+    print '<td class="liste_titre">';
+    print $form->select_dolusers($search_employee, "search_employee", 1, null, 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
+    print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['ct.label']['checked'])) {
+    $typeleaves = $holidaystatic->getTypes(1, -1);
+    $arraytypeleaves = array();
+    foreach ($typeleaves as $key => $val)
+    {
+        $labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+        $arraytypeleaves[$val['rowid']] = $labeltoshow;
+    }
+
+    print '<td class="liste_titre">';
+    print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+    print '</td>';
+}
+
 if (!empty($arrayfields['cp.date_debut']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['cp.date_fin']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['used_days']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['date_start_month']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['date_end_month']['checked'])) print '<td class="liste_titre"></td>';
 if (!empty($arrayfields['used_days_month']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cp.description']['checked'])) print '<td class="liste_titre"></td>';
+
+// Filter: Description
+if (!empty($arrayfields['cp.description']['checked'])) {
+    print '<td class="liste_titre">';
+    print '<input type="text" class="maxwidth100" name="search_description" value="'.$search_description.'">';
+    print '</td>';
+}
+
 // Action column
 print '<td class="liste_titre maxwidthsearch">';
 $searchpicto = $form->showFilterButtons();
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 4ff8238648c..7043f436e87 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -25,9 +25,16 @@
  */
 
 require '../main.inc.php';
+
+// Security check (access forbidden for external user too)
+if (empty($user->rights->holiday->define_holiday) || $user->socid > 0) {
+	accessforbidden();
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/holiday/common.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 $action             = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';				// The action 'add', 'create', 'edit', 'update', 'view', ...
 $massaction         = GETPOST('massaction', 'alpha');												// The bulk action (combo box choice into lists)
@@ -39,15 +46,15 @@ $contextpage        = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ')
 $backtopage         = GETPOST('backtopage', 'alpha');												// Go back to a dedicated page
 $optioncss          = GETPOST('optioncss', 'aZ');													// Option for the css output (always '' except when 'print')
 
-$search_id          = GETPOST('search_id', 'alpha');
-$search_prev_solde  = GETPOST('search_prev_solde', 'alpha');
-$search_new_solde   = GETPOST('search_new_solde', 'alpha');
-$year               = GETPOST('year');
-if (empty($year))
-{
-    $tmpdate = dol_getdate(dol_now());
-    $year = $tmpdate['year'];
-}
+$search_id          = GETPOST('search_id', 'alphanohtml');
+$search_month       = GETPOST('search_month', 'int');
+$search_year        = GETPOST('search_year', 'int');
+$search_employee    = GETPOST('search_employee', 'int');
+$search_validator   = GETPOST('search_validator', 'int');
+$search_description = GETPOST('search_description', 'alphanohtml');
+$search_type        = GETPOST('search_type', 'int');
+$search_prev_solde  = GETPOST('search_prev_solde', 'alphanohtml');
+$search_new_solde   = GETPOST('search_new_solde', 'alphanohtml');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -61,10 +68,6 @@ $pagenext = $page + 1;
 if (! $sortfield) $sortfield="cpl.rowid";
 if (! $sortorder) $sortorder="DESC";
 
-
-// Protection if external user
-if ($user->socid > 0) accessforbidden();
-
 // Si l'utilisateur n'a pas le droit de lire cette page
 if (!$user->rights->holiday->read_all) accessforbidden();
 
@@ -92,81 +95,126 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-if (empty($reshook))
-{
-    // Selection of new fields
-    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 
-    // Purge search criteria
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_id = '';
-        $toselect = '';
-        $search_array_options = array();
-    }
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$search_id = '';
+		$search_month = '';
+		$search_year = '';
+		$search_employee = '';
+		$search_validator = '';
+		$search_description = '';
+		$search_type = '';
+		$search_prev_solde = '';
+		$search_new_solde = '';
+		$toselect = '';
+		$search_array_options = array();
+	}
 
-    if (GETPOST('button_removefilter_x', 'alpha')
-        || GETPOST('button_removefilter.x', 'alpha')
-        || GETPOST('button_removefilter', 'alpha')
-        || GETPOST('button_search_x', 'alpha')
-        || GETPOST('button_search.x', 'alpha')
-        || GETPOST('button_search', 'alpha'))
-    {
-        $massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
-    }
+	if (GETPOST('button_removefilter_x', 'alpha')
+		|| GETPOST('button_removefilter.x', 'alpha')
+		|| GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha')
+		|| GETPOST('button_search.x', 'alpha')
+		|| GETPOST('button_search', 'alpha'))
+	{
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
 
-    // Mass actions
-    /*$objectclass='MyObject';
-    $objectlabel='MyObject';
-    $permissiontoread = $user->rights->mymodule->read;
-    $permissiontodelete = $user->rights->mymodule->delete;
-    $uploaddir = $conf->mymodule->dir_output;
-    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
-    */
+	// Mass actions
+	/*$objectclass='MyObject';
+	$objectlabel='MyObject';
+	$permissiontoread = $user->rights->mymodule->read;
+	$permissiontodelete = $user->rights->mymodule->delete;
+	$uploaddir = $conf->mymodule->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+	*/
 }
 
 
 // Definition of fields for lists
 $arrayfields = array(
-    'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
-    'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-    'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
-    'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
-    'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
-    'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-    'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
-    'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
-    'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
+	'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
+	'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
+	'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
+	'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
+	'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
+	'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
+	'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
+	'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
+	'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
 );
 
+
 /*
  * View
  */
 
 $form = new Form($db);
-
+$formother = new FormOther($db);
+$holidaylogstatic = new stdClass();
 $alltypeleaves = $object->getTypes(1, -1); // To have labels
 
-llxHeader('', $langs->trans('CPTitreMenu').' ('.$langs->trans("Year").' '.$year.')');
+llxHeader('', $langs->trans('CPTitreMenu'));
 
-$sqlwhere = " AND date_action BETWEEN ".
-$sqlwhere.= "'".$db->idate(dol_get_first_day($year, 1, 1))."'";
-$sqlwhere.= " AND ";
-$sqlwhere.= "'".$db->idate(dol_get_last_day($year, 12, 1))."'";
+$sqlwhere = '';
 
-if ($search_id != '')         $sqlwhere.= natural_search('rowid', $search_id, 1);
-if ($search_prev_solde != '') $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1);
-if ($search_new_solde != '')  $sqlwhere.= natural_search('new_solde', $search_new_solde, 1);
+if (!empty($search_year) && $search_year > 0) {
+	if (!empty($search_month) && $search_month > 0) {
+		$from_date  = dol_get_first_day($search_year, $search_month, 1);
+		$to_date    = dol_get_last_day($search_year, $search_month, 1);
+	} else {
+		$from_date  = dol_get_first_day($search_year, 1, 1);
+		$to_date    = dol_get_last_day($search_year, 12, 1);
+	}
+
+	$sqlwhere .= "AND date_action BETWEEN '".$db->idate($from_date)."' AND '".$db->idate($to_date)."'";
+}
+
+if (!empty($search_id) && $search_id > 0)                   $sqlwhere.= natural_search('rowid', $search_id, 1);
+if (!empty($search_validator) && $search_validator > 0)     $sqlwhere.= natural_search('fk_user_action', $search_validator, 1);
+if (!empty($search_employee) && $search_employee > 0)       $sqlwhere.= natural_search('fk_user_update', $search_employee, 1);
+if (!empty($search_description))                            $sqlwhere.= natural_search('type_action', $search_description);
+if (!empty($search_type) && $search_type > 0)               $sqlwhere.= natural_search('fk_type', $search_type, 1);
+if (!empty($search_prev_solde))                             $sqlwhere.= natural_search('prev_solde', $search_prev_solde, 1);
+if (!empty($search_new_solde))                              $sqlwhere.= natural_search('new_solde', $search_new_solde, 1);
 
 $sqlorder = $db->order($sortfield, $sortorder);
 
 // Recent changes are more important than old changes
 $log_holiday = $object->fetchLog($sqlorder, $sqlwhere); // Load $object->logs
 
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	//TODO: $result = $db->query($sql);
+	//TODO: $nbtotalofrecords = $db->num_rows($result);
+	$nbtotalofrecords = is_array($object->logs) ? count($object->logs) : 0;
+
+	if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+// TODO: $num = $db->num_rows($resql);
+$num = is_array($object->logs) ? count($object->logs) : 0;
+
 $param = '';
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
-if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
-if ($search_id) $param = '&search_id='.urlencode($search_id);
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"])   $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit)                     $param .= '&limit='.urlencode($limit);
+if (!empty($search_id))                                             $param .= '&search_statut='.urlencode($search_statut);
+if (!empty($search_month) && $search_month > 0)                     $param .= '&search_month='.urlencode($search_month);
+if (!empty($search_year) && $search_year > 0)                       $param .= '&search_year='.urlencode($search_year);
+if (!empty($search_validator) && $search_validator > 0)             $param .= '&search_validator='.urlencode($search_validator);
+if (!empty($search_employee) && $search_employee > 0)               $param .= '&search_employee='.urlencode($search_employee);
+if (!empty($search_description))                                    $param .= '&search_description='.urlencode($search_description);
+if (!empty($search_type) && $search_type > 0)                       $param .= '&search_type='.urlencode($search_type);
+if (!empty($search_prev_solde))                                     $param .= '&search_prev_solde='.urlencode($search_prev_solde);
+if (!empty($search_new_solde))                                      $param .= '&search_new_solde='.urlencode($search_new_solde);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -178,44 +226,23 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$pagination = '<div class="pagination">';
-$pagination.= '<ul>';
-$pagination.= '<li class="pagination">';
+$newcardbutton = dolGetButtonTitle($langs->trans('MenuAddCP'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/holiday/card.php?action=request', '', $user->rights->holiday->write);
+print_barre_liste($langs->trans('LogCP'), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_hrm', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-$pagination.= '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year - 1).$param.'">';
-$pagination.= '<i class="fa fa-chevron-left" title="Previous"></i>';
-$pagination.= '</a>';
-
-$pagination.= '<li class="pagination">';
-$pagination.= '<span class="active">'.$langs->trans("Year").' '.$year.'</span>';
-$pagination.= '</li>';
-
-$pagination.= '<li class="pagination">';
-$pagination.= '<a href="'.$_SERVER["PHP_SELF"].'?year='.($year + 1).$param.'">';
-$pagination.= '<i class="fa fa-chevron-right" title="Next"></i>';
-$pagination.= '</a>';
-$pagination.= '</li>';
-
-$pagination.= '</li>';
-$pagination.= '</ul>';
-$pagination.= '</div>';
-
-print load_fiche_titre($langs->trans('LogCP'), $pagination, 'title_hrm.png');
-
-print '<div class="info">'.$langs->trans('LastUpdateCP').': '."\n";
+print '<div class="info">'.$langs->trans('LastUpdateCP').': ';
 
 $lastUpdate = $object->getConfCP('lastUpdate');
-if ($lastUpdate)
-{
-    $monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
-    $yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
-    print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
-    print '<br>'.$langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>'."\n";
+if ($lastUpdate) {
+	$monthLastUpdate = $lastUpdate[4].$lastUpdate[5];
+	$yearLastUpdate = $lastUpdate[0].$lastUpdate[1].$lastUpdate[2].$lastUpdate[3];
+	print '<strong>'.dol_print_date($db->jdate($object->getConfCP('lastUpdate')), 'dayhour', 'tzuser').'</strong>';
+	print '<br>';
+	print $langs->trans("MonthOfLastMonthlyUpdate").': <strong>'.$yearLastUpdate.'-'.$monthLastUpdate.'</strong>';
+} else {
+	print $langs->trans('None');
 }
-else {
-    print $langs->trans('None');
-}
-print "</div><br>\n";
+print '</div>';
+print '<br>';
 
 $moreforfilter = '';
 
@@ -225,20 +252,84 @@ $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfiel
 $selectedfields.=(count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
+print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">';
 
-print '<tbody>';
+print '<tr class="liste_titre_filter">';
+
+// Filter Id
+if (!empty($arrayfields['cpl.rowid']['checked'])) {
+	print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['cpl.date_action']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.dol_escape_htmltag($search_month).'">';
+	print $formother->selectyear($search_year, 'search_year', 1, 10, 5, 0, 0, '', 'maxwidth200', true);
+	print '</td>';
+}
+
+// Filter: Validator
+if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
+	$validator = new UserGroup($db);
+	$excludefilter = $user->admin ? '' : 'u.rowid <> '.$user->id;
+	$valideurobjects = $validator->listUsersForGroup($excludefilter);
+	$valideurarray = array();
+
+	foreach ($valideurobjects as $val) {
+		$valideurarray[$val->id] = $val->id;
+	}
+
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_validator, "search_validator", 1, "", 0, $valideurarray, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print '</td>';
+}
+
+// Filter: User
+if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
+	print '<td class="liste_titre">';
+	print $form->select_dolusers($search_employee, "search_employee", 1, "", $disabled, $include, '', 0, 0, 0, $morefilter, 0, '', 'maxwidth200');
+	print '</td>';
+}
+
+// Filter: Description
+if (!empty($arrayfields['cpl.type_action']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_description" value="'.$search_description.'">';
+	print '</td>';
+}
+
+// Filter: Type
+if (!empty($arrayfields['cpl.fk_type']['checked'])) {
+	foreach ($alltypeleaves as $key => $val) {
+		$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+		$arraytypeleaves[$val['rowid']] = $labeltoshow;
+	}
+
+	print '<td class="liste_titre">';
+	print $form->selectarray('search_type', $arraytypeleaves, $search_type, 1, 0, 0, '', 0, 0, 0, '', '', 1);
+	print '</td>';
+}
+
+// Filter: Previous balance
+if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'">';
+	print '</td>';
+}
+
+// Filter: Variation (only placeholder)
+if (!empty($arrayfields['variation']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}
+
+// Filter: New Balance
+if (!empty($arrayfields['cpl.new_solde']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'">';
+	print '</td>';
+}
 
-print '<tr class="liste_titre">';
-if (!empty($arrayfields['cpl.rowid']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_id" value="'.$search_id.'"></td>';
-if (!empty($arrayfields['cpl.date_action']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.fk_user_action']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.fk_user_update']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.type_action']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.fk_type']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.prev_solde']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_prev_solde" value="'.$search_prev_solde.'"></td>';
-if (!empty($arrayfields['variation']['checked'])) print '<td class="liste_titre"></td>';
-if (!empty($arrayfields['cpl.new_solde']['checked'])) print '<td class="liste_titre"><input type="text" class="maxwidth50" name="search_new_solde" value="'.$search_new_solde.'"></td>';
 // Action column
 print '<td class="liste_titre maxwidthsearch">';
 $searchpicto = $form->showFilterButtons();
@@ -256,51 +347,102 @@ if (!empty($arrayfields['cpl.fk_type']['checked'])) print_liste_field_titre($arr
 if (!empty($arrayfields['cpl.prev_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.prev_solde']['label'], $_SERVER["PHP_SELF"], 'prev_solde', '', '', '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['variation']['checked'])) print_liste_field_titre($arrayfields['variation']['label'], $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'right ');
 if (!empty($arrayfields['cpl.new_solde']['checked'])) print_liste_field_titre($arrayfields['cpl.new_solde']['label'], $_SERVER["PHP_SELF"], 'new_solde', '', '', '', $sortfield, $sortorder, 'right ');
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print '</tr>';
 
+// TODO: $i = 0;
+$i = 1;
 
-foreach ($object->logs as $logs_CP)
+while ($i < min($num, $limit))
 {
-    $user_action = new User($db);
-    $user_action->fetch($logs_CP['fk_user_action']);
+	//TODO: $obj = $db->fetch_object($resql);
+	$obj = next($object->logs);
 
-    $user_update = new User($db);
-    $user_update->fetch($logs_CP['fk_user_update']);
+	$holidaylogstatic->id				= $obj['rowid'];
+	$holidaylogstatic->date				= $obj['date_action'];
+	$holidaylogstatic->validator		= $obj['fk_user_action'];
+	$holidaylogstatic->employee			= $obj['fk_user_update'];
+	$holidaylogstatic->description		= $obj['type_action'];
+	$holidaylogstatic->type				= $obj['fk_type'];
+	$holidaylogstatic->balance_previous	= $obj['prev_solde'];
+	$holidaylogstatic->balance_new		= $obj['new_solde'];
 
-    $delta = price2num($logs_CP['new_solde'] - $logs_CP['prev_solde'], 5);
-    $detasign = ($delta > 0 ? '+' : '');
+	print '<tr class="oddeven">';
 
-    print '<tr class="oddeven">';
-    if (!empty($arrayfields['cpl.rowid']['checked'])) print '<td>'.$logs_CP['rowid'].'</td>';
-    if (!empty($arrayfields['cpl.date_action']['checked'])) print '<td style="text-align: center;">'.$logs_CP['date_action'].'</td>';
-    if (!empty($arrayfields['cpl.fk_user_action']['checked'])) print '<td>'.$user_action->getNomUrl(-1).'</td>';
-    if (!empty($arrayfields['cpl.fk_user_update']['checked'])) print '<td>'.$user_update->getNomUrl(-1).'</td>';
-    if (!empty($arrayfields['cpl.type_action']['checked'])) print '<td>'.$logs_CP['type_action'].'</td>';
-    if (!empty($arrayfields['cpl.fk_type']['checked']))
-    {
-        print '<td>';
-        $label = (($alltypeleaves[$logs_CP['fk_type']]['code'] && $langs->trans($alltypeleaves[$logs_CP['fk_type']]['code']) != $alltypeleaves[$logs_CP['fk_type']]['code']) ? $langs->trans($alltypeleaves[$logs_CP['fk_type']]['code']) : $alltypeleaves[$logs_CP['fk_type']]['label']);
-        print $label ? $label : $logs_CP['fk_type'];
-        print '</td>';
-    }
+	// Id
+	if (!empty($arrayfields['cpl.rowid']['checked'])) {
+		print '<td>'.$holidaylogstatic->id.'</td>';
+	}
 
-    if (!empty($arrayfields['cpl.prev_solde']['checked'])) print '<td style="text-align: right;">'.price2num($logs_CP['prev_solde'], 5).' '.$langs->trans('days').'</td>';
-    if (!empty($arrayfields['variation']['checked'])) print '<td style="text-align: right;">'.$detasign.$delta.'</td>';
-    if (!empty($arrayfields['cpl.new_solde']['checked'])) print '<td style="text-align: right;">'.price2num($logs_CP['new_solde'], 5).' '.$langs->trans('days').'</td>';
-    print '<td></td>';
-    print '</tr>'."\n";
+	// Date
+	if (!empty($arrayfields['cpl.date_action']['checked'])) {
+		print '<td style="text-align: center">'.$holidaylogstatic->date.'</td>';
+	}
+
+	// Validator
+	if (!empty($arrayfields['cpl.fk_user_action']['checked'])) {
+		$user_action = new User($db);
+		$user_action->fetch($holidaylogstatic->validator);
+		print '<td>'.$user_action->getNomUrl(-1).'</td>';
+	}
+
+	// Emloyee
+	if (!empty($arrayfields['cpl.fk_user_update']['checked'])) {
+		$user_update = new User($db);
+		$user_update->fetch($holidaylogstatic->employee);
+		print '<td>'.$user_update->getNomUrl(-1).'</td>';
+	}
+
+	// Description
+	if (!empty($arrayfields['cpl.type_action']['checked'])) {
+		print '<td>'.$holidaylogstatic->description.'</td>';
+	}
+
+	// Type
+	if (!empty($arrayfields['cpl.fk_type']['checked'])) {
+		if ($alltypeleaves[$holidaylogstatic->type]['code'] && $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']) != $alltypeleaves[$holidaylogstatic->type]['code']) {
+			$label = $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']);
+		} else {
+			$label = $alltypeleaves[$holidaylogstatic->type]['label'];
+		}
+
+		print '<td>';
+		print $label ? $label : $holidaylogstatic->type;
+		print '</td>';
+	}
+
+	// Previous balance
+	if (!empty($arrayfields['cpl.prev_solde']['checked'])) {
+		print '<td style="text-align: right;">'.price2num($holidaylogstatic->balance_previous, 5).' '.$langs->trans('days').'</td>';
+	}
+
+	// Variation
+	if (!empty($arrayfields['variation']['checked'])) {
+		$delta = price2num($holidaylogstatic->balance_new - $holidaylogstatic->balance_previous, 5);
+		$detasign = ($delta > 0 ? '+' : '');
+		print '<td style="text-align: right;">'.$detasign.$delta.'</td>';
+	}
+
+	// New Balance
+	if (!empty($arrayfields['cpl.new_solde']['checked'])) {
+		print '<td style="text-align: right;">'.price2num($holidaylogstatic->balance_new, 5).' '.$langs->trans('days').'</td>';
+	}
+
+	// Buttons
+	print '<td></td>';
+
+	print '</tr>';
+
+	$i++;
 }
 
-if ($log_holiday == '2')
-{
-    print '<tr class="opacitymedium">';
-    print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
-    print '</tr>';
+if ($log_holiday == '2') {
+	print '<tr class="opacitymedium">';
+	print '<td colspan="10" class="opacitymedium">'.$langs->trans('NoRecordFound').'</td>';
+	print '</tr>';
 }
 
-print '</tbody>'."\n";
-print '</table>'."\n";
+print '</table>';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 88141debfad..3955e3f849a 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -96,42 +96,42 @@ print '<div class="fichecenter"><div class="fichethirdleft">';
 
 if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
 {
-    if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
-    {
-    	$langs->load("holiday");
-        $listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
-    }
-    if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
-    {
-    	$langs->load("trips");
-        $listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
-    }
-    if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
-    {
-    	$langs->load("trips");
-        $listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
-    }
-    if (count($listofsearchfields))
-    {
-    	print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
-    	print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<div class="div-table-responsive-no-min">';
-    	print '<table class="noborder nohover centpercent">';
-    	$i = 0;
-    	foreach ($listofsearchfields as $key => $value)
-    	{
-    		if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    		print '<tr '.$bc[false].'>';
-    		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
-    		print '</tr>';
-    		$i++;
-    	}
-    	print '</table>';
-        print '</div>';
-    	print '</form>';
-    	print '<br>';
-    }
+	if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
+	{
+		$langs->load("holiday");
+		$listofsearchfields['search_holiday'] = array('text'=>'TitreRequestCP');
+	}
+	if (!empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
+	{
+		$langs->load("trips");
+		$listofsearchfields['search_deplacement'] = array('text'=>'ExpenseReport');
+	}
+	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
+	{
+		$langs->load("trips");
+		$listofsearchfields['search_expensereport'] = array('text'=>'ExpenseReport');
+	}
+	if (count($listofsearchfields))
+	{
+		print '<form method="post" action="'.DOL_URL_ROOT.'/core/search.php">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		$i = 0;
+		foreach ($listofsearchfields as $key => $value)
+		{
+			if ($i == 0) print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Search").'</td></tr>';
+			print '<tr '.$bc[false].'>';
+			print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
+			if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+			print '</tr>';
+			$i++;
+		}
+		print '</table>';
+		print '</div>';
+		print '</form>';
+		print '<br>';
+	}
 }
 
 
@@ -141,26 +141,26 @@ if (!empty($conf->holiday->enabled))
 	{
 		$user_id = $user->id;
 
-        print '<div class="div-table-responsive-no-min">';
-	    print '<table class="noborder nohover centpercent">';
-	    print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
-	    print '<tr class="oddeven">';
-	    print '<td colspan="3">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder nohover centpercent">';
+		print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Holidays").'</th></tr>';
+		print '<tr class="oddeven">';
+		print '<td colspan="3">';
 
-	    $out = '';
-	    $typeleaves = $holiday->getTypes(1, 1);
-	    foreach ($typeleaves as $key => $val)
-	    {
-	    	$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
-	    	$nb_holiday += $nb_type;
-	    	$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
-	    }
-	    print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
-	    print $out;
+		$out = '';
+		$typeleaves = $holiday->getTypes(1, 1);
+		foreach ($typeleaves as $key => $val)
+		{
+			$nb_type = $holiday->getCPforUser($user->id, $val['rowid']);
+			$nb_holiday += $nb_type;
+			$out .= ' - '.$val['label'].': <strong>'.($nb_type ?price2num($nb_type) : 0).'</strong><br>';
+		}
+		print $langs->trans('SoldeCPUser', round($nb_holiday, 5)).'<br>';
+		print $out;
 
-	    print '</td>';
-	    print '</tr>';
-	    print '</table></div><br>';
+		print '</td>';
+		print '</tr>';
+		print '</table></div><br>';
 	} elseif (!is_numeric($conf->global->HOLIDAY_HIDE_BALANCE))
 	{
 		print $langs->trans($conf->global->HOLIDAY_HIDE_BALANCE).'<br>';
@@ -175,80 +175,80 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 // Latest leave requests
 if (!empty($conf->holiday->enabled) && $user->rights->holiday->read)
 {
-    $sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut as user_status,";
-    $sql .= " x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
-    $sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE u.rowid = x.fk_user";
-    $sql .= " AND x.entity = ".$conf->entity;
-    if (empty($user->rights->holiday->read_all)) $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
-    //if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-    //if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
-    $sql .= $db->order("x.tms", "DESC");
-    $sql .= $db->plimit($max, 0);
+	$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.email, u.photo, u.statut as user_status,";
+	$sql .= " x.rowid, x.rowid as ref, x.fk_type, x.date_debut as date_start, x.date_fin as date_end, x.halfday, x.tms as dm, x.statut as status";
+	$sql .= " FROM ".MAIN_DB_PREFIX."holiday as x, ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE u.rowid = x.fk_user";
+	$sql .= " AND x.entity = ".$conf->entity;
+	if (empty($user->rights->holiday->read_all)) $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
+	//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+	//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
+	$sql .= $db->order("x.tms", "DESC");
+	$sql .= $db->plimit($max, 0);
 
-    $result = $db->query($sql);
-    if ($result)
-    {
-        $var = false;
-        $num = $db->num_rows($result);
+	$result = $db->query($sql);
+	if ($result)
+	{
+		$var = false;
+		$num = $db->num_rows($result);
 
-        $holidaystatic = new Holiday($db);
-        $userstatic = new User($db);
+		$holidaystatic = new Holiday($db);
+		$userstatic = new User($db);
 
-        $listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
-        $typeleaves = $holidaystatic->getTypes(1, -1);
+		$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
+		$typeleaves = $holidaystatic->getTypes(1, -1);
 
-        $i = 0;
+		$i = 0;
 
-        print '<div class="div-table-responsive-no-min">';
-        print '<table class="noborder centpercent">';
-        print '<tr class="liste_titre">';
-        print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests", min($max, $num)).'</th>';
-        print '<th>'.$langs->trans("from").'</th>';
-        print '<th>'.$langs->trans("to").'</th>';
-        print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/holiday/list.php?sortfield=cp.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
-        print '</tr>';
-        if ($num)
-        {
-            while ($i < $num && $i < $max)
-            {
-                $obj = $db->fetch_object($result);
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("BoxTitleLastLeaveRequests", min($max, $num)).'</th>';
+		print '<th>'.$langs->trans("from").'</th>';
+		print '<th>'.$langs->trans("to").'</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/holiday/list.php?sortfield=cp.tms&sortorder=DESC">'.$langs->trans("FullList").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num && $i < $max)
+			{
+				$obj = $db->fetch_object($result);
 
-                $holidaystatic->id = $obj->rowid;
-                $holidaystatic->ref = $obj->ref;
-                $holidaystatic->statut = $obj->status;
+				$holidaystatic->id = $obj->rowid;
+				$holidaystatic->ref = $obj->ref;
+				$holidaystatic->statut = $obj->status;
 
-                $userstatic->id = $obj->uid;
-                $userstatic->lastname = $obj->lastname;
-                $userstatic->firstname = $obj->firstname;
-                $userstatic->login = $obj->login;
-                $userstatic->photo = $obj->photo;
-                $userstatic->email = $obj->email;
-                $userstatic->statut = $obj->user_status;
+				$userstatic->id = $obj->uid;
+				$userstatic->lastname = $obj->lastname;
+				$userstatic->firstname = $obj->firstname;
+				$userstatic->login = $obj->login;
+				$userstatic->photo = $obj->photo;
+				$userstatic->email = $obj->email;
+				$userstatic->statut = $obj->user_status;
 
-                print '<tr class="oddeven">';
-                print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
-                print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-                print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
+				print '<tr class="oddeven">';
+				print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
+				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+				print '<td>'.$typeleaves[$obj->fk_type]['label'].'</td>';
 
-                $starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
-                $endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
+				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
+				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
 
-                print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
-                print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
-                print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
-                print '<td class="right nowrap" width="16">'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
-                print '</tr>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_start), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+				print '<td>'.dol_print_date($db->jdate($obj->date_end), 'day').' <span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+				print '<td class="right">'.dol_print_date($db->jdate($obj->dm), 'day').'</td>';
+				print '<td class="right nowrap" width="16">'.$holidaystatic->LibStatut($obj->status, 3).'</td>';
+				print '</tr>';
 
-                $i++;
-            }
-        } else {
-            print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        }
-        print '</table>';
-        print '</div>';
-        print '<br>';
-    } else dol_print_error($db);
+				$i++;
+			}
+		} else {
+			print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print '</table>';
+		print '</div>';
+		print '<br>';
+	} else dol_print_error($db);
 }
 
 
@@ -298,7 +298,7 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
 				$userstatic->id = $obj->uid;
 				$userstatic->lastname = $obj->lastname;
 				$userstatic->firstname = $obj->firstname;
-                $userstatic->email = $obj->email;
+				$userstatic->email = $obj->email;
 				$userstatic->login = $obj->login;
 				$userstatic->statut = $obj->user_status;
 				$userstatic->photo = $obj->photo;
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 71fad9dee9b..6c93d96619f 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -361,7 +361,7 @@ if ($step == 1 || !$datatoimport)
             print '</td><td style="text-align: right">';
 			if ($objimport->array_import_perms[$key])
 			{
-				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
+				print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=2&datatoimport='.$objimport->array_import_code[$key].$param.'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
 			} else {
 				print $langs->trans("NotEnoughPermissions");
 			}
@@ -424,7 +424,7 @@ if ($step == 2 && $datatoimport)
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 
-	print '<span class="opacitymedium">'.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'filenew')).'</span><br><br>';
+	print '<span class="opacitymedium">'.$langs->trans("ChooseFormatOfFileToImport", img_picto('', 'next', '')).'</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -445,7 +445,7 @@ if ($step == 2 && $datatoimport)
 		print '<td style="text-align:center"><a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank">'.$langs->trans("DownloadEmptyExample").'</a></td>';
 		// Action button
 		print '<td style="text-align:right">';
-		print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=3&format='.$key.$param.'">'.img_picto($langs->trans("SelectFormat"), 'filenew').'</a>';
+		print '<a href="'.DOL_URL_ROOT.'/imports/import.php?step=3&format='.$key.$param.'">'.img_picto($langs->trans("SelectFormat"), 'next', 'class="fa-15x"').'</a>';
 		print '</td>';
 		print '</tr>';
 	}
@@ -549,7 +549,7 @@ if ($step == 3 && $datatoimport)
 	print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
 	print '<input type="hidden" value="'.$datatoimport.'" name="datatoimport">';
 
-	print '<span class="opacitymedium">'.$langs->trans("ChooseFileToImport", img_picto('', 'filenew')).'</span><br><br>';
+	print '<span class="opacitymedium">'.$langs->trans("ChooseFileToImport", img_picto('', 'next')).'</span><br><br>';
 
 	print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
@@ -643,7 +643,7 @@ if ($step == 3 && $datatoimport)
 			print '">'.img_delete().'</a></td>';
 			// Action button
 			print '<td style="text-align:right">';
-			print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"), 'filenew').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?step=4'.$param.'&filetoimport='.urlencode($relativepath).'">'.img_picto($langs->trans("NewImport"), 'next', 'class="fa-15x"').'</a>';
 			print '</td>';
 			print '</tr>';
 		}
diff --git a/htdocs/includes/odtphp/odf.php b/htdocs/includes/odtphp/odf.php
index 5ec9b8f8870..5012337daf8 100644
--- a/htdocs/includes/odtphp/odf.php
+++ b/htdocs/includes/odtphp/odf.php
@@ -142,7 +142,7 @@ class Odf
 		}
 
 		$this->vars[$tag] = $this->convertVarToOdf($value, $encode, $charset);
-		
+
 		return $this;
 	}
 
@@ -156,6 +156,7 @@ class Odf
      */
 	public function convertVarToOdf($value, $encode = true, $charset = 'ISO-8859')
 	{
+		$value = $encode ? htmlspecialchars($value) : $value;
 		$value = ($charset == 'ISO-8859') ? utf8_encode($value) : $value;
 		$convertedValue = $value;
 
@@ -170,9 +171,9 @@ class Odf
 				'<style:style style:name="subText" style:family="text"><style:text-properties style:text-position="sub 58%" /></style:style>',
 				'<style:style style:name="supText" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>'
 			);
-	
+
 			$convertedValue = $this->_replaceHtmlWithOdtTag($this->_getDataFromHtml($value), $customStyles, $fontDeclarations);
-	
+
 			foreach ($customStyles as $key => $val) {
 				array_push($automaticStyles, '<style:style style:name="customStyle' . $key . '" style:family="text">' . $val . '</style:style>');
 			}
@@ -399,7 +400,7 @@ class Odf
 	public function htmlToUTFAndPreOdf($value)
 	{
 		// We decode into utf8, entities
-		$value=dol_html_entity_decode($value, ENT_QUOTES);
+		$value=dol_html_entity_decode($value, ENT_QUOTES|ENT_HTML5);
 
 		// We convert html tags
 		$ishtml=dol_textishtml($value);
diff --git a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
index 218fb6df1e5..8681dfbdbfa 100644
--- a/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
+++ b/htdocs/includes/tecnickcom/tcpdf/include/tcpdf_fonts.php
@@ -1149,7 +1149,7 @@ class TCPDF_FONTS {
 								$subsetglyphs[$g] = true;
 							}
 						}
-					}	
+					}
 					break;
 				}
 				case 6: { // Format 6: Trimmed table mapping
diff --git a/htdocs/install/mysql/data/llx_c_product_nature.sql b/htdocs/install/mysql/data/llx_c_product_nature.sql
new file mode 100644
index 00000000000..8351ff2ab79
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_product_nature.sql
@@ -0,0 +1,28 @@
+-- Copyright (C) 2020 florian HENRY florian.henry@scopen.fr
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- from the install and all '--' are removed.
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_product_nature (code, label, active) VALUES (0, 'RowMaterial', 1);
+INSERT INTO llx_c_product_nature (code, label, active) VALUES (1, 'Finished', 1);
+
diff --git a/htdocs/install/mysql/data/llx_c_transport_mode.sql b/htdocs/install/mysql/data/llx_c_transport_mode.sql
new file mode 100644
index 00000000000..69f6ac7f6b8
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_transport_mode.sql
@@ -0,0 +1,31 @@
+-- Copyright (C) 2019-2020  Open-DSI			<support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('MAR', 'Transport maritime (y compris camions ou wagons sur bateau)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('TRA', 'Transport par chemin de fer (y compris camions sur wagon)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('ROU', 'Transport par route', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('AIR', 'Transport par air', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('POS', 'Envois postaux', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('OLE', 'Installations de transport fixe (oléoduc)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('NAV', 'Transport par navigation intérieure', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('PRO', 'Propulsion propre', 1);
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 831097ebf48..19c6070eb2a 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -123,10 +123,11 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 5
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1021, 102,   0, 0, '0', 0, '0', 0, 'Μηδενικό Φ.Π.Α.', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1022, 102,  24, 0, '0', 0, '0', 0, 'Κανονικός Φ.Π.Α.', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1023, 102,  13, 0, '0', 0, '0', 0, 'Μειωμένος Φ.Π.Α.', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1024, 102, 6.5, 0, '0', 0, '0', 0, 'Υπερμειωμένος Φ.Π.Α.', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1024, 102,   6, 0, '0', 0, '0', 0, 'Υπερμειωμένος Φ.Π.Α.', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1025, 102,  16, 0, '0', 0, '0', 0, 'Νήσων κανονικός Φ.Π.Α.', 1);
 insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1026, 102,   9, 0, '0', 0, '0', 0, 'Νήσων μειωμένος Φ.Π.Α.', 1);
-insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1027, 102,   5, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1027, 102,   4, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,localtax1,localtax1_type,localtax2,localtax2_type,recuperableonly,note,active) values (1028, 102,  17, 0, '0', 0, '0', 0, 'Νήσων υπερμειωμένος Φ.Π.Α.', 1);
 
 -- ICELAND (id country=116)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (1161, 116,   '0','0','VAT rate 0',1);
diff --git a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
index b66d205ef40..9bb097d10b2 100644
--- a/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
+++ b/htdocs/install/mysql/migration/10.0.0-11.0.0.sql
@@ -119,7 +119,7 @@ ALTER TABLE llx_categorie_warehouse ADD CONSTRAINT fk_categorie_warehouse_fk_war
 create table llx_holiday_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -135,7 +135,7 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 create table llx_entrepot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -165,7 +165,7 @@ ALTER TABLE llx_events ADD COLUMN prefix_session varchar(255) NULL;
 create table llx_payment_salary_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- salary payment id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -183,8 +183,8 @@ ALTER TABLE llx_oauth_token ADD COLUMN fk_soc integer DEFAULT NULL after token;
 
 ALTER TABLE llx_adherent_type ADD COLUMN duration varchar(6) DEFAULT NULL after morphy;
 
-ALTER TABLE llx_mailing ADD COLUMN tms timestamp;
-ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp;
+ALTER TABLE llx_mailing ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_mailing_cibles ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_projet ADD COLUMN usage_opportunity integer DEFAULT 0;
 ALTER TABLE llx_projet ADD COLUMN usage_task integer DEFAULT 1;
@@ -458,7 +458,7 @@ create table llx_c_shipment_package_type
 
 CREATE TABLE llx_product_fournisseur_price_extrafields (
 	rowid               integer AUTO_INCREMENT PRIMARY KEY,
-	tms                 timestamp,
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_object           integer NOT NULL,
 	import_key          varchar(14) -- import key
 ) ENGINE=innodb;
@@ -478,7 +478,7 @@ CREATE TABLE llx_mrp_mo(
     note_private text,
     date_creation datetime NOT NULL,
     date_valid datetime NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_user_creat integer NOT NULL,
     fk_user_modif integer,
     fk_user_valid integer,
@@ -514,7 +514,7 @@ ALTER TABLE llx_mrp_mo ADD INDEX idx_mrp_mo_fk_project (fk_project);
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -551,7 +551,7 @@ CREATE TABLE llx_mrp_production(
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14)
@@ -576,7 +576,7 @@ ALTER TABLE llx_facture_rec MODIFY COLUMN fk_cond_reglement integer NOT NULL DEF
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -587,7 +587,7 @@ ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index 994e5d89495..488548ae8b1 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -36,7 +36,7 @@ UPDATE llx_c_units set scale = 86400 where code = 'D' and unit_type = 'time';
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -57,7 +57,7 @@ create table llx_c_shipment_package_type
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -69,7 +69,7 @@ ALTER TABLE llx_facture_rec MODIFY COLUMN titre varchar(200) NOT NULL;
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -303,7 +303,7 @@ ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_
 ALTER TABLE llx_categorie_website_page ADD CONSTRAINT fk_categorie_website_page_website_page_rowid FOREIGN KEY (fk_website_page) REFERENCES llx_website_page (rowid);
 
 ALTER TABLE llx_categorie ADD COLUMN date_creation	datetime;
-ALTER TABLE llx_categorie ADD COLUMN tms     		timestamp;
+ALTER TABLE llx_categorie ADD COLUMN tms     		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_creat	integer;
 ALTER TABLE llx_categorie ADD COLUMN fk_user_modif	integer;
 
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 88c17cc0619..389d7dc478e 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -47,7 +47,7 @@ ALTER TABLE llx_bom_bom_extrafields ADD INDEX idx_bom_bom_extrafields_fk_object
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -103,10 +103,47 @@ ALTER TABLE llx_user DROP COLUMN whatsapp;
 ALTER TABLE llx_user ADD COLUMN datestartvalidity datetime;
 ALTER TABLE llx_user ADD COLUMN dateendvalidity   datetime;
 
+-- Intracomm Report
+CREATE TABLE llx_c_transport_mode (
+  rowid     integer AUTO_INCREMENT PRIMARY KEY,
+  entity    integer	DEFAULT 1 NOT NULL,	-- multi company id
+  code      varchar(3) NOT NULL,
+  label     varchar(255) NOT NULL,
+  active    tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
+
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('MAR', 'Transport maritime (y compris camions ou wagons sur bateau)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('TRA', 'Transport par chemin de fer (y compris camions sur wagon)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('ROU', 'Transport par route', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('AIR', 'Transport par air', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('POS', 'Envois postaux', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('OLE', 'Installations de transport fixe (oléoduc)', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('NAV', 'Transport par navigation intérieure', 1);
+INSERT INTO llx_c_transport_mode (code, label, active) VALUES ('PRO', 'Propulsion propre', 1);
+
+ALTER TABLE llx_facture ADD COLUMN fk_transport_mode integer after location_incoterms;
+ALTER TABLE llx_facture_fourn ADD COLUMN fk_transport_mode integer after location_incoterms;
+
+ALTER TABLE llx_societe ADD COLUMN transport_mode tinyint after cond_reglement;
+ALTER TABLE llx_societe ADD COLUMN transport_mode_supplier tinyint after cond_reglement_supplier;
+
+CREATE TABLE llx_intracommreport
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+
+  ref				varchar(30)        NOT NULL,			-- report reference number
+  entity			integer  DEFAULT 1 NOT NULL,			-- multi company id
+  type_declaration	varchar(32),
+  periods			varchar(32),
+  mode				varchar(32),
+  content_xml		text,
+  type_export		varchar(10),
+  datec             datetime,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
+)ENGINE=innodb;
+
 ALTER TABLE llx_c_incoterms ADD COLUMN label varchar(100) NULL;
 
-
-
 CREATE TABLE llx_recruitment_recruitmentjobposition(
 	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
 	ref varchar(128) DEFAULT '(PROV)' NOT NULL,
@@ -124,7 +161,7 @@ CREATE TABLE llx_recruitment_recruitmentjobposition(
 	note_public text,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	last_main_doc varchar(255),
@@ -150,7 +187,7 @@ ALTER TABLE llx_recruitment_recruitmentjobposition ADD COLUMN remuneration_sugge
 create table llx_recruitment_recruitmentjobposition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -169,7 +206,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
 	note_public text,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -200,7 +237,7 @@ ALTER TABLE llx_recruitment_recruitmentcandidature ADD INDEX idx_recruitment_rec
 create table llx_recruitment_recruitmentcandidature_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -275,6 +312,7 @@ ALTER TABLE llx_recruitment_recruitmentcandidature ADD UNIQUE INDEX uk_recruitme
 
 ALTER TABLE llx_product MODIFY COLUMN seuil_stock_alerte float;
 ALTER TABLE llx_product MODIFY COLUMN desiredstock float;
+
 ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN seuil_stock_alerte float;
 ALTER TABLE llx_product_warehouse_properties MODIFY COLUMN desiredstock float;
 
@@ -290,8 +328,8 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52);
 
-ALTER TABLE llx_ecm_directories CHANGE COLUMN date_m tms timestamp;
-ALTER TABLE llx_ecm_files CHANGE COLUMN date_m tms timestamp;
+ALTER TABLE llx_ecm_directories CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+ALTER TABLE llx_ecm_files CHANGE COLUMN date_m tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 INSERT INTO llx_c_email_templates (entity,module,type_template,lang,private,fk_user,datec,label,position,enabled,active,topic,content,content_lines,joinfiles) VALUES (0,'recruitment','recruitmentcandidature_send','',0,null,null,'(AnswerCandidature)'                    ,100,'$conf->recruitment->enabled',1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__',       '__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',null, 0);
 
@@ -324,6 +362,8 @@ ALTER TABLE llx_facturedet ADD COLUMN ref_ext varchar(255) AFTER multicurrency_t
 ALTER TABLE llx_c_ticket_category ADD COLUMN fk_parent integer DEFAULT 0 NOT NULL;
 ALTER TABLE llx_c_ticket_category ADD COLUMN force_severity varchar(32) NULL;
 
+ALTER TABLE llx_expensereport ADD COLUMN fk_user_creat integer NULL;
+
 ALTER TABLE llx_expensereport_ik ADD COLUMN ikoffset double DEFAULT 0 NOT NULL;
 
 ALTER TABLE llx_paiement ADD COLUMN ref_ext varchar(255) AFTER ref;
@@ -337,7 +377,7 @@ ALTER TABLE llx_menu MODIFY COLUMN enabled text;
 CREATE TABLE llx_ecm_files_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                             -- import key
 ) ENGINE=innodb;
@@ -347,7 +387,7 @@ ALTER TABLE llx_ecm_files_extrafields ADD INDEX idx_ecm_files_extrafields (fk_ob
 CREATE TABLE llx_ecm_directories_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                             -- import key
 ) ENGINE=innodb;
@@ -355,3 +395,29 @@ CREATE TABLE llx_ecm_directories_extrafields
 ALTER TABLE llx_ecm_directories_extrafields ADD INDEX idx_ecm_directories_extrafields (fk_object);
 ALTER TABLE llx_website_page ADD COLUMN object_type varchar(255);
 ALTER TABLE llx_website_page ADD COLUMN fk_object varchar(255);
+
+DELETE FROM llx_const WHERE name in ('MAIN_INCLUDE_ZERO_VAT_IN_REPORTS');
+
+UPDATE llx_projet_task_time SET tms = null WHERE tms = 0;
+ALTER TABLE llx_projet_task_time MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
+
+ALTER TABLE llx_projet_task_time MODIFY COLUMN datec datetime;
+
+DELETE FROM llx_user_rights WHERE fk_id IN (SELECT id FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous'); 
+DELETE FROM llx_rights_def where module = 'holiday' and perms = 'lire_tous';
+
+CREATE TABLE llx_c_product_nature (
+      rowid integer AUTO_INCREMENT PRIMARY KEY,
+      code tinyint NOT NULL,
+      label varchar(100),
+      active tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
+
+ALTER TABLE llx_c_product_nature ADD UNIQUE INDEX uk_c_product_nature(code, active);
+
+INSERT INTO llx_c_product_nature (code, label, active) VALUES (0, 'RowMaterial', 1);
+INSERT INTO llx_c_product_nature (code, label, active) VALUES (1, 'Finished', 1);
+
+ALTER TABLE llx_product MODIFY COLUMN finished tinyint DEFAULT NULL;
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code);
+
diff --git a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
index a4ab666299d..4104d74da51 100644
--- a/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
+++ b/htdocs/install/mysql/migration/3.0.0-3.1.0.sql
@@ -419,19 +419,19 @@ update llx_actioncomm set elementtype='order' where elementtype='commande';
 update llx_actioncomm set elementtype='contract' where elementtype='contrat';
 
 
-alter table llx_propal add column   tms             timestamp after fk_projet;
+alter table llx_propal add column   tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after fk_projet;
 
 
 create table llx_product_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL
 ) ENGINE=innodb;
 create table llx_societe_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL
 ) ENGINE=innodb;
 
@@ -487,7 +487,7 @@ ALTER TABLE llx_don ADD   phone           varchar(24) after email;
 ALTER TABLE llx_element_element MODIFY sourcetype varchar(32) NOT NULL;
 ALTER TABLE llx_element_element MODIFY targettype varchar(32) NOT NULL;
 
-ALTER TABLE llx_societe_prices MODIFY tms timestamp NULL;
+ALTER TABLE llx_societe_prices MODIFY tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 -- ALTER TABLE llx_societe_prices ALTER COLUMN tms DROP NOT NULL;
 
 -- Fix: It seems this is missing for some users
diff --git a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
index 044b1652029..c7356cc18ff 100644
--- a/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
+++ b/htdocs/install/mysql/migration/3.1.0-3.2.0.sql
@@ -62,7 +62,7 @@ ALTER TABLE llx_societe MODIFY code_compta varchar(24);
 ALTER TABLE llx_societe MODIFY code_compta_fournisseur varchar(24);
 
   
-ALTER TABLE llx_chargesociales ADD COLUMN tms                   timestamp;
+ALTER TABLE llx_chargesociales ADD COLUMN tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_chargesociales ADD COLUMN date_creation         datetime; 
 ALTER TABLE llx_chargesociales ADD COLUMN date_valid            datetime;
 
@@ -118,7 +118,7 @@ CREATE TABLE llx_localtax
 (
 	rowid			integer		AUTO_INCREMENT PRIMARY KEY,
 	entity			integer			NOT NULL DEFAULT '1',
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datep			date			DEFAULT NULL,
 	datev			date			DEFAULT NULL,
 	amount			double			NOT NULL DEFAULT '0',
diff --git a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
index c0efe6d68b3..07b390f32c4 100644
--- a/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
+++ b/htdocs/install/mysql/migration/3.2.0-3.3.0.sql
@@ -39,7 +39,7 @@ ALTER TABLE llx_societe DROP COLUMN description;
 ALTER TABLE llx_societe DROP COLUMN services;
 ALTER TABLE llx_societe MODIFY COLUMN ref_ext varchar(128);
 
-ALTER TABLE llx_bank ADD COLUMN tms timestamp after datec;
+ALTER TABLE llx_bank ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP after datec;
   
 -- Monaco VAT Rates
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 271,  27,'19.6','0','VAT standard rate (France hors DOM-TOM)',1);
@@ -267,7 +267,7 @@ ALTER TABLE llx_extrafields ADD COLUMN fieldrequired INTEGER DEFAULT 0;
 create table llx_socpeople_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                                 -- import key
 ) ENGINE=innodb;
@@ -276,7 +276,7 @@ ALTER TABLE llx_socpeople_extrafields ADD INDEX idx_socpeople_extrafields (fk_ob
 create table llx_actioncomm_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -835,7 +835,7 @@ CREATE TABLE llx_product_price_by_qty
 (
   rowid			integer AUTO_INCREMENT PRIMARY KEY,
   fk_product_price	integer NOT NULL,
-  date_price		timestamp,
+  date_price		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   price			double (24,8) DEFAULT 0,
   price_ttc		double (24,8) DEFAULT 0,
   qty_min		real DEFAULT 0
@@ -910,7 +910,7 @@ ALTER TABLE llx_bank_account MODIFY COLUMN code_banque varchar(8);
 create table llx_user_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
index 88d9ae1b685..edc2c931ee1 100644
--- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
+++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql
@@ -23,7 +23,7 @@ ALTER TABLE llx_menu MODIFY COLUMN leftmenu varchar(100);
 create table llx_adherent_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -115,7 +115,7 @@ ALTER TABLE llx_c_shipment_mode ADD COLUMN tracking VARCHAR(255) NOT NULL DEFAUL
 
 -- VMYSQL4.3 ALTER TABLE llx_c_shipment_mode CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
 -- VPGSQL8.2 DROP table llx_c_shipment_mode;
--- VPGSQL8.2 CREATE TABLE llx_c_shipment_mode (rowid SERIAL PRIMARY KEY, tms timestamp, code varchar(30) NOT NULL, libelle varchar(50) NOT NULL, description text, tracking varchar(255) NOT NULL, active integer DEFAULT 0, module varchar(32) NULL);
+-- VPGSQL8.2 CREATE TABLE llx_c_shipment_mode (rowid SERIAL PRIMARY KEY, tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, code varchar(30) NOT NULL, libelle varchar(50) NOT NULL, description text, tracking varchar(255) NOT NULL, active integer DEFAULT 0, module varchar(32) NULL);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (1,'CATCH','Catch','Catch by client','',1);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (2,'TRANS','Transporter','Generic transporter','',1);
 -- VPGSQL8.2 INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,tracking,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi','',0);
@@ -136,7 +136,7 @@ ALTER TABLE llx_stock_mouvement MODIFY COLUMN value real;
 create table llx_propal_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -145,7 +145,7 @@ ALTER TABLE llx_propal_extrafields ADD INDEX idx_propal_extrafields (fk_object);
 create table llx_facture_extrafields
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) -- import key
 ) ENGINE=innodb;
@@ -205,7 +205,7 @@ ALTER TABLE llx_facturedet DROP COLUMN fk_export_compta;
 CREATE TABLE llx_cronjob 
 (
 	rowid 			integer AUTO_INCREMENT PRIMARY KEY,
-	tms 			timestamp,
+	tms 			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 			datetime,
 	jobtype			varchar(10) NOT NULL,
   	label 			text NOT NULL,
@@ -249,7 +249,7 @@ DROP TABLE llx_printer_ipp;
 CREATE TABLE llx_printer_ipp 
 (
 	rowid integer AUTO_INCREMENT PRIMARY KEY,
-	tms 	timestamp,
+	tms 	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 	datetime,
 	printer_name text NOT NULL, 
 	printer_location text NOT NULL,
@@ -265,7 +265,7 @@ ALTER TABLE llx_adherent MODIFY COLUMN ref_ext varchar(128);
 create table llx_commande_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -299,7 +299,7 @@ ALTER TABLE llx_socpeople CHANGE COLUMN note note_private text;
 create table llx_projet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -308,7 +308,7 @@ ALTER TABLE llx_projet_extrafields ADD INDEX idx_projet_extrafields (fk_object);
 create table llx_projet_task_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -319,7 +319,7 @@ CREATE TABLE llx_opensurvey_comments (
     id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
     id_sondage CHAR(16) NOT NULL,
     comment text NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     usercomment text
 ) ENGINE=InnoDB;
 
@@ -336,7 +336,7 @@ CREATE TABLE llx_opensurvey_sondage (
        survey_link_visible integer DEFAULT 1,
 	   canedit integer DEFAULT 0,
        origin varchar(64),
-       tms timestamp,
+       tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	   sujet TEXT
 ) ENGINE=InnoDB;
 CREATE TABLE llx_opensurvey_user_studs (
@@ -344,7 +344,7 @@ CREATE TABLE llx_opensurvey_user_studs (
     nom VARCHAR(64) NOT NULL,
     id_sondage VARCHAR(16) NOT NULL,
     reponses VARCHAR(100) NOT NULL,
-    tms timestamp
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=InnoDB;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN id_sondage_admin CHAR(24);
@@ -367,7 +367,7 @@ UPDATE llx_extrafields SET elementtype='societe' WHERE elementtype='company';
 create table llx_commande_fournisseur_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -376,7 +376,7 @@ ALTER TABLE llx_commande_fournisseur_extrafields ADD INDEX idx_commande_fourniss
 create table llx_facture_fourn_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
index c6dc0ff9bd7..af3ea13fa5c 100644
--- a/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
+++ b/htdocs/install/mysql/migration/3.4.0-3.5.0.sql
@@ -43,7 +43,7 @@ ALTER TABLE llx_socpeople ADD COLUMN statut tinyint DEFAULT 1 NOT NULL AFTER imp
 create table llx_fichinter_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -55,7 +55,7 @@ ALTER TABLE llx_product ADD COLUMN desiredstock integer DEFAULT 0;
 create table llx_commandedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    
   import_key       varchar(14)      	
 )ENGINE=innodb;
@@ -69,7 +69,7 @@ ALTER TABLE llx_facturedet_rec ADD COLUMN info_bits	integer DEFAULT 0 after tota
 create table llx_facturedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -79,7 +79,7 @@ ALTER TABLE llx_facturedet_extrafields ADD INDEX idx_facturedet_extrafields (fk_
 create table llx_propaldet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -314,7 +314,7 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 
 -- Add ref_ext on bordereau_cheque
 ALTER TABLE llx_bordereau_cheque ADD ref_ext VARCHAR(255);
-ALTER TABLE llx_bordereau_cheque ADD tms timestamp;
+ALTER TABLE llx_bordereau_cheque ADD tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 
 -- Task 1011
@@ -337,7 +337,7 @@ ALTER TABLE llx_contratdet ADD column product_type integer DEFAULT 1 after total
 create table llx_contrat_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
index 5727b946bcb..32ed4c32538 100644
--- a/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
+++ b/htdocs/install/mysql/migration/3.5.0-3.6.0.sql
@@ -74,7 +74,7 @@ ALTER TABLE llx_bookmark MODIFY COLUMN url varchar(255) NOT NULL;
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
--- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+-- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN entity integer DEFAULT 1 NOT NULL;
@@ -108,7 +108,7 @@ create table llx_product_customer_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,
   price						double(24,8) DEFAULT 0,
@@ -164,7 +164,7 @@ ALTER TABLE llx_product ADD COLUMN tobatch tinyint DEFAULT 0 NOT NULL;
 
 CREATE TABLE llx_product_batch (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product_stock integer NOT NULL,
   eatby datetime DEFAULT NULL,
   sellby datetime DEFAULT NULL,
@@ -187,7 +187,7 @@ CREATE TABLE llx_expeditiondet_batch (
 --DROP TABLE llx_payment_salary
 CREATE TABLE llx_payment_salary (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user integer NOT NULL,
   datep date,
   datev date,
@@ -229,7 +229,7 @@ ALTER TABLE llx_projet_task_time ADD thm double(24,8) AFTER fk_user;
 create table llx_categories_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -283,7 +283,7 @@ CREATE TABLE llx_resource
   fk_code_type_resource varchar(32),
   note_public     		text,
   note_private    		text,
-  tms         			timestamp
+  tms         			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_resource ADD INDEX fk_code_type_resource_idx (fk_code_type_resource);
@@ -298,7 +298,7 @@ CREATE TABLE llx_element_resources
   busy			  integer,
   mandatory		  integer,
   fk_user_create   integer,
-  tms             timestamp
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_element_resources ADD UNIQUE INDEX idx_element_resources_idx1 (resource_id, resource_type, element_id, element_type);
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 6dc2521ca5d..640f22e4bee 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -137,7 +137,7 @@ DROP TABLE llx_compta_compte_generaux;
 -- Align size for accounting account
 ALTER TABLE llx_accountingaccount MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_accountingaccount MODIFY COLUMN account_parent varchar(32);
-ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec;
+ALTER TABLE llx_accountingaccount add column tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP AFTER datec;
 ALTER TABLE llx_accountingdebcred MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_bank_account MODIFY COLUMN account_number varchar(32);
 ALTER TABLE llx_c_chargesociales MODIFY COLUMN accountancy_code varchar(32);
@@ -233,7 +233,7 @@ create table llx_accounting_fiscalyear
 	statut			tinyint DEFAULT 0 NOT NULL,
 	entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
 	datec			datetime NOT NULL,
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_author	integer NULL,
 	fk_user_modif	integer NULL
 )ENGINE=innodb;
@@ -1050,7 +1050,7 @@ create table llx_c_email_templates
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id utilisateur si modele prive, sinon null
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   position        smallint,					      -- Position
   active          tinyint DEFAULT 1  NOT NULL,
@@ -1112,7 +1112,7 @@ ALTER TABLE llx_projet_task MODIFY COLUMN planned_workload real DEFAULT 0 NULL;
 CREATE TABLE llx_fichinterdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -1121,7 +1121,7 @@ ALTER TABLE llx_fichinterdet_extrafields ADD INDEX idx_ficheinterdet_extrafields
 
 CREATE TABLE llx_usergroup_extrafields (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
index ca677fc5224..00bf30f6672 100644
--- a/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
+++ b/htdocs/install/mysql/migration/3.7.0-3.8.0.sql
@@ -49,7 +49,7 @@ create table llx_loan
   rowid							integer AUTO_INCREMENT PRIMARY KEY,
   entity						integer DEFAULT 1 NOT NULL,
   datec							datetime,
-  tms							timestamp,
+  tms							timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label							varchar(80) NOT NULL,
   fk_bank						integer,
   capital						real     DEFAULT 0 NOT NULL,
@@ -75,7 +75,7 @@ create table llx_payment_loan
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,
   amount_capital	real DEFAULT 0,
   amount_insurance	real DEFAULT 0,
@@ -145,7 +145,7 @@ ALTER TABLE llx_product ADD COLUMN lifo double(24,8) AFTER fifo;
 CREATE TABLE llx_printing
 (
  rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  datec datetime,
  printer_name text NOT NULL,
  printer_location text NOT NULL,
@@ -177,7 +177,7 @@ DELETE from llx_const where name = 'MAIN_USE_JQUERY_MULTISELECT' and value = '1'
 create table llx_bank_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -198,7 +198,7 @@ ALTER TABLE llx_bank_account_extrafields ADD INDEX idx_bank_account_extrafields
 create table llx_contratdet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -210,7 +210,7 @@ ALTER TABLE llx_product_fournisseur_price ADD COLUMN delivery_time_days integer;
 
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN comment	varchar(255);
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN status integer;
-ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN tms timestamp;
+ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN batch varchar(30) DEFAULT NULL;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN eatby date DEFAULT NULL;
 ALTER TABLE llx_commande_fournisseur_dispatch ADD COLUMN sellby date DEFAULT NULL;
@@ -240,7 +240,7 @@ CREATE TABLE llx_expensereport (
   date_approve		datetime,
   date_refuse 		datetime,
   date_cancel 		datetime,
-  tms 		 		timestamp,
+  tms 		 		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_author 	integer NOT NULL,
   fk_user_modif 	integer DEFAULT NULL,
   fk_user_valid 	integer DEFAULT NULL,
@@ -297,7 +297,7 @@ create table llx_payment_expensereport
   rowid                   integer AUTO_INCREMENT PRIMARY KEY,
   fk_expensereport        integer,
   datec                   datetime,           -- date de creation
-  tms                     timestamp,
+  tms                     timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep                   datetime,           -- payment date
   amount                  real DEFAULT 0,
   fk_typepayment          integer NOT NULL,
@@ -316,7 +316,7 @@ ALTER TABLE llx_societe ADD COLUMN name_alias varchar(128) NULL;
 create table llx_commande_fournisseurdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -327,7 +327,7 @@ ALTER TABLE llx_commande_fournisseurdet_extrafields ADD INDEX idx_commande_fourn
 create table llx_facture_fourn_det_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -357,7 +357,7 @@ CREATE TABLE llx_askpricesupplier (
   ref_int varchar(255) DEFAULT NULL,
   fk_soc integer DEFAULT NULL,
   fk_projet integer DEFAULT NULL,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec datetime DEFAULT NULL,
   date_valid datetime DEFAULT NULL,
   date_cloture datetime DEFAULT NULL,
@@ -422,14 +422,14 @@ CREATE TABLE llx_askpricesupplierdet (
 
 CREATE TABLE llx_askpricesupplier_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
 
 CREATE TABLE llx_askpricesupplierdet_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
@@ -491,7 +491,7 @@ ALTER TABLE llx_don CHANGE COLUMN fk_project fk_projet integer NULL;
 create table llx_don_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -503,7 +503,7 @@ create table llx_payment_donation
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_donation     integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          real DEFAULT 0,
   fk_typepayment  integer NOT NULL,
@@ -585,7 +585,7 @@ CREATE TABLE IF NOT EXISTS llx_propal_merge_pdf_product (
   fk_user_author integer DEFAULT NULL,
   fk_user_mod integer NOT NULL,
   datec datetime NOT NULL,
-  tms timestamp NOT NULL,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=InnoDB;
 
diff --git a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
index f749e57b432..363288708d4 100644
--- a/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
+++ b/htdocs/install/mysql/migration/3.8.0-3.9.0.sql
@@ -146,7 +146,7 @@ CREATE TABLE llx_ecm_files
   cover             text,                           -- is this file a file to use for a cover
   extraparams		varchar(255),					-- for stock other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  date_m			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text							-- for future permission 'per file'
@@ -227,7 +227,7 @@ CREATE TABLE IF NOT EXISTS llx_establishment (
   fk_user_author 	integer NOT NULL,
   fk_user_mod		integer NOT NULL,
   datec				datetime NOT NULL,
-  tms				timestamp NOT NULL,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   status            smallint DEFAULT 1
 ) ENGINE=InnoDB;
 
@@ -236,7 +236,7 @@ CREATE TABLE IF NOT EXISTS llx_user_rib (
   fk_user        integer      NOT NULL,
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label          varchar(30),
   bank           varchar(255),  -- bank name
   code_banque    varchar(128),  -- bank code
@@ -263,7 +263,7 @@ create table llx_stock_lotserial
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -282,7 +282,7 @@ create table llx_budget
   date_start	date,
   date_end		date,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -296,7 +296,7 @@ create table llx_budget_lines
   fk_project_ids	varchar(255) NOT NULL,		-- List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'.
   amount		double(24,8) NOT NULL,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
@@ -369,7 +369,7 @@ create table llx_categorie_project
 create table llx_expedition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -379,7 +379,7 @@ ALTER TABLE llx_expedition_extrafields ADD INDEX idx_expedition_extrafields (fk_
 create table llx_expeditiondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -392,7 +392,7 @@ ALTER TABLE llx_expeditiondet_extrafields ADD INDEX idx_expeditiondet_extrafield
 create table llx_livraison_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -402,7 +402,7 @@ ALTER TABLE llx_livraison_extrafields ADD INDEX idx_livraison_extrafields (fk_ob
 create table llx_livraisondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
@@ -595,7 +595,7 @@ insert into llx_c_chargesociales (id, libelle, deductible, active, code, fk_pays
 
 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN doc_ref varchar(300) NOT NULL;
 
-ALTER TABLE llx_holiday ADD COLUMN tms timestamp;
+ALTER TABLE llx_holiday ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_holiday ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_holiday ADD INDEX idx_holiday_entity (entity);
 
diff --git a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
index 6ec4fc35f92..6bf230df12a 100644
--- a/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
+++ b/htdocs/install/mysql/migration/3.9.0-4.0.0.sql
@@ -54,7 +54,7 @@ CREATE TABLE llx_product_lot (
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer
@@ -140,7 +140,7 @@ CREATE TABLE llx_website
 	fk_default_home integer,
     date_creation     datetime,
     date_modification datetime,
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 ALTER TABLE llx_website ADD COLUMN fk_default_home integer;
 ALTER TABLE llx_website CHANGE COLUMN shortname ref varchar(24) NOT NULL;
@@ -158,7 +158,7 @@ CREATE TABLE llx_website_page
     status        integer,
     date_creation     datetime,
     date_modification datetime,
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
@@ -475,7 +475,7 @@ CREATE TABLE llx_advtargetemailing
   fk_user_author integer NOT NULL,
   datec datetime NOT NULL,
   fk_user_mod integer NOT NULL,
-  tms timestamp NOT NULL
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=InnoDB;
 
 ALTER TABLE llx_advtargetemailing ADD UNIQUE INDEX uk_advtargetemailing_name (name);
diff --git a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
index 175e03ec179..7578c633be4 100644
--- a/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
+++ b/htdocs/install/mysql/migration/4.0.0-5.0.0.sql
@@ -114,7 +114,7 @@ ALTER TABLE llx_societe_remise ADD COLUMN entity	integer DEFAULT 1 NOT NULL afte
 create table llx_expensereport_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -133,7 +133,7 @@ UPDATE llx_adherent_type SET subscription = '1' WHERE subscription = 'yes';
 CREATE TABLE llx_product_lot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -145,7 +145,7 @@ ALTER TABLE llx_website_page MODIFY COLUMN content MEDIUMTEXT;
 CREATE TABLE llx_product_warehouse_properties
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
-  tms             		timestamp,
+  tms             		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      		integer NOT NULL,
   fk_entrepot     		integer NOT NULL,
   seuil_stock_alerte    integer DEFAULT 0,
@@ -156,7 +156,7 @@ CREATE TABLE llx_product_warehouse_properties
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN entity integer DEFAULT 1 NOT NULL;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN fk_user_modif     integer;
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_creation		datetime;
-ALTER TABLE llx_accounting_bookkeeping ADD COLUMN tms               timestamp;
+ALTER TABLE llx_accounting_bookkeeping ADD COLUMN tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 -- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN numero_compte varchar(32) NOT NULL;
 -- VMYSQL4.3 ALTER TABLE llx_accounting_bookkeeping MODIFY COLUMN code_journal varchar(32) NOT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_accounting_bookkeeping ALTER COLUMN numero_compte SET NOT NULL;
@@ -186,7 +186,7 @@ ALTER TABLE llx_entrepot ADD COLUMN fk_parent integer DEFAULT 0;
 create table llx_resource_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -222,7 +222,7 @@ create table llx_user_employment
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   fk_user			integer,
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   job				varchar(128),				-- job position. may be a dictionary
diff --git a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
index b53b25f93b1..87eda0668b1 100644
--- a/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
+++ b/htdocs/install/mysql/migration/5.0.0-6.0.0.sql
@@ -61,7 +61,7 @@ ALTER TABLE llx_supplier_proposaldet CHANGE COLUMN fk_askpricesupplier fk_suppli
 -- VMYSQL4.3 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN date_fin DATETIME NULL DEFAULT NULL;
 -- VPGSQL8.2 ALTER TABLE llx_opensurvey_sondage ALTER COLUMN date_fin DROP NOT NULL;
 
--- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP;
+-- VMYSQL4.1 ALTER TABLE llx_opensurvey_sondage MODIFY COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN fk_user_creat integer NOT NULL DEFAULT 0;
 ALTER TABLE llx_opensurvey_sondage ADD COLUMN status integer DEFAULT 1 after date_fin;
@@ -160,7 +160,7 @@ ALTER TABLE llx_projet ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_projet_task ADD COLUMN fk_user_modif integer;
 
 ALTER TABLE llx_projet_task_time ADD COLUMN datec date;
-ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp;
+ALTER TABLE llx_projet_task_time ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_product_price ADD COLUMN fk_multicurrency integer;
 ALTER TABLE llx_product_price ADD COLUMN multicurrency_code	varchar(255);
@@ -171,12 +171,12 @@ ALTER TABLE llx_product_price ADD COLUMN multicurrency_price_ttc double(24,8) DE
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_creat integer;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_product_price_by_qty DROP COLUMN date_price;
-ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp;
+ALTER TABLE llx_product_price_by_qty ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 ALTER TABLE llx_product_price_by_qty ADD COLUMN import_key varchar(14);
 
 ALTER TABLE llx_user ADD COLUMN import_key varchar(14);
 
-ALTER TABLE llx_facture_rec ADD COLUMN tms timestamp;
+ALTER TABLE llx_facture_rec ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 UPDATE llx_facture_rec SET tms = datec where tms < '2000-01-01';
 
 CREATE TABLE llx_product_attribute
@@ -295,7 +295,7 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification 
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| date last modification 
   import_key            varchar(14),
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
@@ -391,7 +391,7 @@ ALTER TABLE llx_contratdet ADD COLUMN vat_src_code varchar(10) DEFAULT '';
 CREATE TABLE llx_payment_various
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec                 datetime,
   datep                 date,
   datev                 date,
@@ -438,7 +438,7 @@ rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
 entity integer DEFAULT 0, 
 ref varchar(48),
 datec datetime DEFAULT NULL,
-tms timestamp, 
+tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 fk_user_author	integer,
 fk_user_modif     integer,
 fk_user_valid		integer,
@@ -453,7 +453,7 @@ CREATE TABLE llx_inventorydet
 ( 
 rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
 datec datetime DEFAULT NULL,
-tms timestamp, 
+tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
@@ -467,7 +467,7 @@ new_pmp double DEFAULT 0
 )ENGINE=InnoDB;
 
 ALTER TABLE llx_inventory ADD COLUMN datec datetime DEFAULT NULL;
-ALTER TABLE llx_inventory ADD COLUMN tms timestamp;
+ALTER TABLE llx_inventory ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_tms (tms);
 ALTER TABLE llx_inventory ADD INDEX idx_inventory_datec (datec);
@@ -502,7 +502,7 @@ CREATE TABLE llx_loan_schedule
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         
   amount_capital	real DEFAULT 0,
   amount_insurance	real DEFAULT 0,
@@ -547,7 +547,7 @@ CREATE TABLE llx_website_page
     fk_user_create integer,
     fk_user_modif  integer,
     date_creation  datetime,
-	tms            timestamp
+	tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_website_page ADD UNIQUE INDEX uk_website_page_url (fk_website,pageurl);
@@ -566,7 +566,7 @@ UPDATE llx_extrafields set elementtype='categorie' where elementtype='categories
 CREATE TABLE llx_blockedlog 
 ( 
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
-	tms	timestamp,
+	tms	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
 	amounts real NOT NULL, 
 	signature varchar(100) NOT NULL, 
@@ -593,7 +593,7 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 ALTER TABLE llx_blockedlog_authority ADD INDEX signature (signature);
@@ -613,7 +613,7 @@ ALTER TABLE llx_mailing_cibles MODIFY COLUMN source_url varchar(255);
 CREATE TABLE llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -623,7 +623,7 @@ ALTER TABLE llx_facture_rec_extrafields ADD INDEX idx_facture_rec_extrafields (f
 CREATE TABLE llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,
   import_key       varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
index ff6a1fe03fb..93a7a447c18 100644
--- a/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
+++ b/htdocs/install/mysql/migration/6.0.0-7.0.0.sql
@@ -265,7 +265,7 @@ ALTER TABLE llx_menu MODIFY fk_leftmenu varchar(100);
 CREATE TABLE llx_website_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -285,7 +285,7 @@ CREATE TABLE llx_website_account(
     date_last_login     datetime,
     date_previous_login datetime,
 	date_creation       datetime NOT NULL, 
-	tms                 timestamp, 
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat       integer NOT NULL, 
 	fk_user_modif       integer, 
 	import_key          varchar(14), 
@@ -307,7 +307,7 @@ ALTER TABLE llx_website_account ADD CONSTRAINT llx_website_account_fk_website FO
 CREATE TABLE llx_website_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -326,7 +326,7 @@ alter table llx_user add column pass_encoding varchar(24) NULL;
 CREATE TABLE IF NOT EXISTS llx_expensereport_ik (
     rowid           integer  AUTO_INCREMENT PRIMARY KEY,
     datec           datetime  DEFAULT NULL,
-    tms             timestamp,
+    tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_c_exp_tax_cat integer DEFAULT 0 NOT NULL,
     fk_range        integer DEFAULT 0 NOT NULL,
     coef            double DEFAULT 0 NOT NULL,
@@ -441,7 +441,7 @@ INSERT INTO llx_c_exp_tax_range (rowid,fk_c_exp_tax_cat,range_ik, entity, active
 CREATE TABLE llx_expensereport_rules (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     dates datetime NOT NULL,
     datee datetime NOT NULL,
     amount numeric(24,8) NOT NULL,
@@ -464,7 +464,7 @@ ALTER TABLE llx_extrafields ADD COLUMN fk_user_author integer;
 ALTER TABLE llx_extrafields ADD COLUMN fk_user_modif integer;
 ALTER TABLE llx_extrafields ADD COLUMN datec datetime;
 ALTER TABLE llx_extrafields ADD COLUMN enabled varchar(255) DEFAULT '1';
-ALTER TABLE llx_extrafields ADD COLUMN tms timestamp;
+ALTER TABLE llx_extrafields ADD COLUMN tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP;
 
 -- We fix value of 'list' from 0 to 1 for all extrafields created before this migration
 --VMYSQL4.1 UPDATE llx_extrafields SET list = 1 WHERE list = 0 AND fk_user_author IS NULL and fk_user_modif IS NULL and datec IS NULL;		
@@ -528,7 +528,7 @@ DROP TABLE llx_projet_task_comment;
 CREATE TABLE llx_comment (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     description text NOT NULL,
     fk_user_author integer DEFAULT NULL,
     fk_element integer DEFAULT NULL,
@@ -572,7 +572,7 @@ create table llx_c_email_senderprofile
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   date_creation   datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   email           varchar(255),					  -- Email
   signature		  text,                           -- Predefined signature
@@ -655,7 +655,7 @@ create table llx_onlinesignature
   object_type               varchar(32) NOT NULL,
   object_id					integer NOT NULL,
   datec                     datetime NOT NULL,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   name						varchar(255) NOT NULL,
   ip						varchar(128),
   pathoffile				varchar(255)
@@ -709,7 +709,7 @@ ALTER TABLE llx_resource ADD CONSTRAINT fk_resource_fk_country FOREIGN KEY (fk_c
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
index 380c64c28fc..888f4fefdd0 100644
--- a/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
+++ b/htdocs/install/mysql/migration/7.0.0-8.0.0.sql
@@ -149,7 +149,7 @@ CREATE TABLE llx_societe_remise_supplier
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
@@ -246,7 +246,7 @@ CREATE TABLE llx_ticket
 	date_read datetime,
 	date_close datetime,
 	notify_tiers_at_create tinyint,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_ticket ADD COLUMN notify_tiers_at_create integer;
@@ -271,7 +271,7 @@ ALTER TABLE llx_ticket_msg ADD CONSTRAINT fk_ticket_msg_fk_track_id FOREIGN KEY
 CREATE TABLE llx_ticket_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    
   import_key       varchar(14)
 )ENGINE=innodb;
@@ -279,7 +279,7 @@ CREATE TABLE llx_ticket_extrafields
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -371,7 +371,7 @@ CREATE TABLE llx_societe_account(
     date_last_login   datetime,
     date_previous_login datetime,
 	date_creation datetime NOT NULL, 
-	tms timestamp NOT NULL, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
@@ -433,7 +433,7 @@ CREATE TABLE llx_asset(
 	note_public text,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -449,7 +449,7 @@ ALTER TABLE llx_asset ADD INDEX idx_asset_fk_asset_type (fk_asset_type);
 create table llx_asset_extrafields
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14)
 ) ENGINE=innodb;
@@ -458,7 +458,7 @@ create table llx_asset_type
 (
   rowid                                 integer AUTO_INCREMENT PRIMARY KEY,
   entity                                integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms                                   timestamp,
+  tms                                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label                                 varchar(50) NOT NULL,
   accountancy_code_asset                varchar(32),
   accountancy_code_depreciation_asset   varchar(32),
@@ -473,7 +473,7 @@ ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_asset_type FOREIGN KEY (fk_asset_t
 create table llx_asset_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
index b7fe131c3f9..36a15d5b85d 100644
--- a/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
+++ b/htdocs/install/mysql/migration/8.0.0-9.0.0.sql
@@ -43,7 +43,7 @@ ALTER TABLE llx_facture ADD COLUMN pos_source varchar(32);
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
@@ -182,7 +182,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
         note_public text,
         note_private text,
         date_creation datetime NOT NULL,
-        tms timestamp NOT NULL,
+        tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
         fk_user_creat integer NOT NULL,
         fk_user_modif integer,
         import_key varchar(14),
@@ -202,7 +202,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
 	type varchar(128) NOT NULL,
 	rulevalue varchar(128) NULL,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
@@ -217,7 +217,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
 	type varchar(128) NOT NULL,
 	actionparam varchar(255) NULL,
 	date_creation datetime NOT NULL,
-	tms timestamp NOT NULL,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	position integer DEFAULT 0,
diff --git a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
index a56cb45e4fe..b9a406515ec 100644
--- a/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
+++ b/htdocs/install/mysql/migration/9.0.0-10.0.0.sql
@@ -87,7 +87,7 @@ create table llx_mailing_unsubscribe
   unsubscribegroup	varchar(128) DEFAULT '',
   ip				varchar(128),
   date_creat		datetime,                            -- creation date
-  tms               timestamp
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
 
 ALTER TABLE llx_mailing_unsubscribe ADD UNIQUE uk_mailing_unsubscribe(email, entity, unsubscribegroup);
@@ -223,7 +223,7 @@ CREATE TABLE llx_bom_bom(
 	qty double(24,8),
 	efficiency double(8,4),
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	date_valid datetime, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
@@ -240,7 +240,7 @@ ALTER TABLE llx_bom_bom ADD COLUMN date_valid datetime;
 create table llx_bom_bom_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -266,7 +266,7 @@ ALTER TABLE llx_bom_bomline ADD COLUMN position integer NOT NULL;
 create table llx_bom_bomline_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
@@ -335,7 +335,7 @@ UPDATE llx_c_shipment_mode SET label = 'https://www.laposte.fr/outils/suivre-vos
 create table llx_reception
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
@@ -383,7 +383,7 @@ ALTER TABLE llx_reception ADD INDEX idx_reception_fk_shipping_method (fk_shippin
 create table llx_reception_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_accounting_account.sql b/htdocs/install/mysql/tables/llx_accounting_account.sql
index 7af83585c7f..893cb19d9ab 100644
--- a/htdocs/install/mysql/tables/llx_accounting_account.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_account.sql
@@ -24,7 +24,7 @@ create table llx_accounting_account
   rowid                     bigint AUTO_INCREMENT PRIMARY KEY,
   entity                    integer DEFAULT 1 NOT NULL,
   datec                     datetime,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_pcg_version            varchar(32)  NOT NULL,			  -- Chart system
   pcg_type                  varchar(20)  NOT NULL,			  -- First part of Key for predefined groups
   account_number            varchar(32)  NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
index cf1c3334092..23e7d489e09 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping.sql
@@ -45,7 +45,7 @@ CREATE TABLE llx_accounting_bookkeeping
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| last modification date
   fk_user               integer NULL,               -- The id of user that validate the accounting source document
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
diff --git a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
index cbf387b9b70..2b8277c70bd 100644
--- a/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_bookkeeping_tmp.sql
@@ -44,7 +44,7 @@ CREATE TABLE llx_accounting_bookkeeping_tmp
   fk_user_author        integer NOT NULL,			-- 					| user creating
   fk_user_modif         integer,					-- 					| user making last change
   date_creation         datetime,					-- FEC:EcritureDate	| creation date
-  tms                   timestamp,					--					| date last modification
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					--					| last modification date
   fk_user               integer NULL,				-- The id of user that validate the accounting source document
   code_journal          varchar(32) NOT NULL,		-- FEC:JournalCode
   journal_label         varchar(255),				-- FEC:JournalLib
diff --git a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
index 90590fb427d..17e9d9dccfb 100644
--- a/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
+++ b/htdocs/install/mysql/tables/llx_accounting_fiscalyear.sql
@@ -25,7 +25,7 @@ create table llx_accounting_fiscalyear
 	statut			tinyint DEFAULT 0 NOT NULL,
 	entity			integer DEFAULT 1 NOT NULL,	  -- multi company id
 	datec			datetime NOT NULL,
-	tms				timestamp,
+	tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_author	integer DEFAULT NULL,
 	fk_user_modif	integer DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 857e6270b90..82d97d3ec98 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -33,7 +33,7 @@ create table llx_actioncomm
   code				varchar(50) NULL,				-- code of action for automatic action ('AC_OTH_AUTO' for automatic actions, 'AC_EMAILIN_AUTO' for email input, 'AC_xxx' for manual action...) 
   
   datec				datetime,						-- date creation
-  tms				timestamp,						-- date modification
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,						-- last modification date
   fk_user_author	integer,						-- user id of user that has created record
   fk_user_mod		integer,						-- user id of user that has modified record
 
diff --git a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
index c820feac430..95a415116ab 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_actioncomm_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index 1917e80c81a..6b5490b282d 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -72,7 +72,7 @@ create table llx_adherent
   model_pdf		   varchar(255),
   datevalid        datetime,  -- date de validation
   datec            datetime,  -- date de creation
-  tms              timestamp, -- date de modification
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- last modification date
   fk_user_author   integer,   -- can be null because member can be create by a guest
   fk_user_mod      integer,
   fk_user_valid    integer,
diff --git a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
index 50f47c7954b..6b67944a321 100644
--- a/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_extrafields.sql
@@ -21,7 +21,7 @@
 create table llx_adherent_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql
index 7e9270b89dc..bdce18ef0bc 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type.sql
@@ -26,7 +26,7 @@ create table llx_adherent_type
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   entity           integer DEFAULT 1 NOT NULL,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   statut           smallint NOT NULL DEFAULT 0,
   libelle          varchar(50) NOT NULL,
   morphy           varchar(3) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
index 2950147730b..d13056a2894 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_adherent_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
index 22d49768887..34bd7eb53bf 100644
--- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql
+++ b/htdocs/install/mysql/tables/llx_advtargetemailing.sql
@@ -28,5 +28,5 @@ CREATE TABLE llx_advtargetemailing
   fk_user_author integer NOT NULL,
   datec datetime NOT NULL,
   fk_user_mod integer NOT NULL,
-  tms timestamp NOT NULL
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset.sql b/htdocs/install/mysql/tables/llx_asset.sql
index b5bb1d1bfe2..52eeda3ba58 100644
--- a/htdocs/install/mysql/tables/llx_asset.sql
+++ b/htdocs/install/mysql/tables/llx_asset.sql
@@ -26,7 +26,7 @@ CREATE TABLE llx_asset(
 	note_public text,
 	note_private text,
 	date_creation datetime NOT NULL,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer,
 	import_key varchar(14),
diff --git a/htdocs/install/mysql/tables/llx_asset_extrafields.sql b/htdocs/install/mysql/tables/llx_asset_extrafields.sql
index 364f0e3d08f..c93fac7b20a 100644
--- a/htdocs/install/mysql/tables/llx_asset_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_asset_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_asset_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_type.sql b/htdocs/install/mysql/tables/llx_asset_type.sql
index bd1c300d087..1205acb959b 100644
--- a/htdocs/install/mysql/tables/llx_asset_type.sql
+++ b/htdocs/install/mysql/tables/llx_asset_type.sql
@@ -17,7 +17,7 @@ create table llx_asset_type
 (
   rowid                                 integer AUTO_INCREMENT PRIMARY KEY,
   entity                                integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms                                   timestamp,
+  tms                                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label                                 varchar(50) NOT NULL,
   accountancy_code_asset                varchar(32),
   accountancy_code_depreciation_asset   varchar(32),
diff --git a/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql b/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
index 59ebe94c7d8..7ff09176216 100644
--- a/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_asset_type_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql
index 8dfdba27baa..0e1dbc403da 100644
--- a/htdocs/install/mysql/tables/llx_bank.sql
+++ b/htdocs/install/mysql/tables/llx_bank.sql
@@ -21,7 +21,7 @@ create table llx_bank
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datev           date,                      -- date de valeur
   dateo           date,                      -- date operation
   amount          double(24,8) NOT NULL default 0,
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index 28a1a0baf34..4ac90dd961d 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -26,7 +26,7 @@ create table llx_bank_account
 (
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
   datec						datetime,
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref						varchar(12) NOT NULL,
   label						varchar(30) NOT NULL,
   entity					integer DEFAULT 1 NOT NULL,	-- multi company id
diff --git a/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
index 5d9d8847154..a30e81ab96c 100644
--- a/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_bank_account_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_blockedlog.sql b/htdocs/install/mysql/tables/llx_blockedlog.sql
index 889b28d7a73..f8145718ea6 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_blockedlog
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	entity integer DEFAULT 1 NOT NULL, 
 	date_creation	datetime,
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	action varchar(50), 
 	amounts double(24,8) NOT NULL, 
 	element varchar(50), 
diff --git a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
index 9e7dae8f23c..eb491f93af4 100644
--- a/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
+++ b/htdocs/install/mysql/tables/llx_blockedlog_authority.sql
@@ -3,5 +3,5 @@ CREATE TABLE llx_blockedlog_authority
 	rowid integer AUTO_INCREMENT PRIMARY KEY, 
 	blockchain longtext NOT NULL,
 	signature varchar(100) NOT NULL,
-	tms timestamp
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bom_bom.sql b/htdocs/install/mysql/tables/llx_bom_bom.sql
index 45c5fce3485..01ec2e63a3e 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom.sql
@@ -31,7 +31,7 @@ CREATE TABLE llx_bom_bom(
 	duration double(24,8) DEFAULT NULL,
 	date_creation datetime NOT NULL,
 	date_valid datetime,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL,
 	fk_user_modif integer, 
 	fk_user_valid integer, 
diff --git a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
index 10c44459a8b..15210546fda 100644
--- a/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bom_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_bom_bom_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
index 1b468da3a22..8ed3e96bd11 100644
--- a/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_bom_bomline_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_bom_bomline_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
index 3050b831eec..9b1d6e24ad4 100644
--- a/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
+++ b/htdocs/install/mysql/tables/llx_bordereau_cheque.sql
@@ -33,7 +33,7 @@ create table llx_bordereau_cheque
   fk_bank_account   integer,
   fk_user_author    integer,
   statut            smallint NOT NULL DEFAULT 0,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   note              text,
   entity            integer DEFAULT 1 NOT NULL			-- multi company id
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql
index 285bbc22603..fbdf0e3ed36 100644
--- a/htdocs/install/mysql/tables/llx_boxes_def.sql
+++ b/htdocs/install/mysql/tables/llx_boxes_def.sql
@@ -23,6 +23,6 @@ create table llx_boxes_def
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   file        varchar(200) NOT NULL,        -- Do not increase this as file+note must be small to allow index
   entity      integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms         timestamp,  
+  tms         timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,  
   note        varchar(130)                  -- Do not increase this as file+note must be small to allow index
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_budget.sql b/htdocs/install/mysql/tables/llx_budget.sql
index d67e65e8f2b..ab9ed79a64a 100644
--- a/htdocs/install/mysql/tables/llx_budget.sql
+++ b/htdocs/install/mysql/tables/llx_budget.sql
@@ -26,7 +26,7 @@ create table llx_budget
   date_start	date,
   date_end		date,
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer  
diff --git a/htdocs/install/mysql/tables/llx_budget_lines.sql b/htdocs/install/mysql/tables/llx_budget_lines.sql
index 1397b604316..ffdf33aa38f 100644
--- a/htdocs/install/mysql/tables/llx_budget_lines.sql
+++ b/htdocs/install/mysql/tables/llx_budget_lines.sql
@@ -23,7 +23,7 @@ create table llx_budget_lines
   fk_project_ids	varchar(180) NOT NULL,		-- 'IDS:x,y' = List of project ids related to this budget. If budget is dedicated to projects not yet started, we recommand to create a project 'Projects to come'. 'FILTER:ref=*ABC' or 'FILTER:categid=123' = Can also be a dynamic rule to select projects.
   amount			double(24,8) NOT NULL,
   datec        		datetime,
-  tms           	timestamp,
+  tms           	timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat 	integer,
   fk_user_modif 	integer,
   import_key    	integer  
diff --git a/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql b/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
index cd81eb4c42a..8b99059acdd 100644
--- a/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_senderprofile.sql
@@ -23,7 +23,7 @@ create table llx_c_email_senderprofile
   entity		  integer DEFAULT 1 NOT NULL,	  -- multi company id
   private         smallint DEFAULT 0 NOT NULL,    -- Template public (0) or private (id of user)
   date_creation   datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(255),					  -- Label of predefined email
   email           varchar(255) NOT NULL,		  -- Email
   signature		  text,                           -- Predefined signature
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
index 3fd97fb2804..04130a208fe 100644
--- a/htdocs/install/mysql/tables/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -27,7 +27,7 @@ create table llx_c_email_templates
   private         smallint DEFAULT 0 NOT NULL,    -- Template public or private
   fk_user         integer,                        -- Id user owner if template is private, or null
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label           varchar(180),					  -- Label of predefined email
   position        smallint,					      -- Position
   enabled         varchar(255) DEFAULT '1',		  -- Condition to have this module visible
diff --git a/htdocs/install/mysql/tables/llx_c_field_list.sql b/htdocs/install/mysql/tables/llx_c_field_list.sql
index c99bfe91690..9177228b363 100644
--- a/htdocs/install/mysql/tables/llx_c_field_list.sql
+++ b/htdocs/install/mysql/tables/llx_c_field_list.sql
@@ -24,7 +24,7 @@
 create table llx_c_field_list
 (
   rowid			integer  AUTO_INCREMENT PRIMARY KEY,
-  tms			timestamp,
+  tms			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   element		varchar(64)        			NOT NULL,		-- name of element list
   entity		integer			DEFAULT 1 	NOT NULL,		-- entity id
   name			varchar(32)        			NOT NULL,		-- name of field with table alias (ex: p.ref)
diff --git a/htdocs/install/mysql/tables/llx_c_product_nature.key.sql b/htdocs/install/mysql/tables/llx_c_product_nature.key.sql
new file mode 100644
index 00000000000..b6a3d2130bf
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_product_nature.key.sql
@@ -0,0 +1 @@
+ALTER TABLE llx_c_product_nature ADD UNIQUE INDEX uk_c_product_nature(code, active);
diff --git a/htdocs/install/mysql/tables/llx_c_product_nature.sql b/htdocs/install/mysql/tables/llx_c_product_nature.sql
new file mode 100644
index 00000000000..3c467ce7cf8
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_product_nature.sql
@@ -0,0 +1,24 @@
+-- ========================================================================
+-- Copyright (C) 2020 Florian HENRY  <florian.henry@scopen.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_c_product_nature (
+     rowid integer AUTO_INCREMENT PRIMARY KEY,
+     code tinyint NOT NULL,
+     label varchar(100),
+     active tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
index 9adc6b3cb0c..6f49f682f24 100644
--- a/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
+++ b/htdocs/install/mysql/tables/llx_c_shipment_mode.sql
@@ -20,7 +20,7 @@ create table llx_c_shipment_mode
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   entity				   integer	DEFAULT 1 NOT NULL,	-- multi company id
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   code             varchar(30) NOT NULL,
   libelle          varchar(50) NOT NULL,
   description      text,
diff --git a/htdocs/install/mysql/tables/llx_c_transport_mode.key.sql b/htdocs/install/mysql/tables/llx_c_transport_mode.key.sql
new file mode 100644
index 00000000000..4a7d5e89009
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_transport_mode.key.sql
@@ -0,0 +1,19 @@
+-- ===================================================================
+-- Copyright (C) 2019      Open-DSI			<support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_c_transport_mode ADD UNIQUE INDEX uk_c_transport_mode (code, entity);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_c_transport_mode.sql b/htdocs/install/mysql/tables/llx_c_transport_mode.sql
new file mode 100644
index 00000000000..a2634f2a0bf
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_transport_mode.sql
@@ -0,0 +1,26 @@
+-- ========================================================================
+-- Copyright (C) 2019      Open-DSI			<support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+CREATE TABLE llx_c_transport_mode (
+  rowid     integer AUTO_INCREMENT PRIMARY KEY,
+  entity    integer	DEFAULT 1 NOT NULL,	-- multi company id
+  code      varchar(3) NOT NULL,
+  label     varchar(255) NOT NULL,
+  active    tinyint DEFAULT 1  NOT NULL
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql
index cf1df953ba5..29cb5a260e6 100644
--- a/htdocs/install/mysql/tables/llx_categorie.sql
+++ b/htdocs/install/mysql/tables/llx_categorie.sql
@@ -32,7 +32,7 @@ create table llx_categorie
 	fk_soc          integer DEFAULT NULL,				-- not used by default. Used when option CATEGORY_ASSIGNED_TO_A_CUSTOMER is set.
 	visible         tinyint DEFAULT 1 NOT NULL,			-- determine if the products are visible or not
     date_creation	datetime,							-- date creation 
-    tms     		timestamp,							-- date modification
+    tms     		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,							-- last modification date
     fk_user_creat	integer,							-- user making creation
     fk_user_modif	integer,							-- user making last change
     import_key      varchar(14)							-- Import key
diff --git a/htdocs/install/mysql/tables/llx_categories_extrafields.sql b/htdocs/install/mysql/tables/llx_categories_extrafields.sql
index 8a2a82f7382..82c52f1b7ee 100644
--- a/htdocs/install/mysql/tables/llx_categories_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_categories_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_categories_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 57434c93d98..db9e82ac779 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -25,7 +25,7 @@ create table llx_chargesociales
   date_ech          datetime NOT NULL,              -- date echeance
   libelle           varchar(80) NOT NULL,
   entity            integer DEFAULT 1 NOT NULL,     -- multi company id
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation     datetime,                       -- date de creation 
   date_valid        datetime,                       -- date de validation
   fk_user_author    integer,                        -- user making creation
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index aa237383452..add836ce5d5 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -32,7 +32,7 @@ create table llx_commande
   fk_soc					integer NOT NULL,
   fk_projet					integer DEFAULT NULL,			-- projet auquel est rattache la commande
 
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation				datetime,						-- date de creation 
   date_valid				datetime,						-- date de validation
   date_cloture				datetime,						-- date de cloture
diff --git a/htdocs/install/mysql/tables/llx_commande_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_extrafields.sql
index e6f3f768489..922bcd820a1 100644
--- a/htdocs/install/mysql/tables/llx_commande_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commande_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
index bc5cadea228..a9f155a2abb 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur.sql
@@ -32,7 +32,7 @@ create table llx_commande_fournisseur
   fk_soc					integer NOT NULL,
   fk_projet					integer DEFAULT 0,             -- project id
 
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   date_creation				datetime,                      -- date de creation 
   date_valid				datetime,                      -- date de validation
   date_approve				datetime,                      -- date de approve
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
index 22a0e241dd6..b5f85fea250 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
@@ -36,5 +36,5 @@ create table llx_commande_fournisseur_dispatch
   sellby         date DEFAULT NULL,
   status         integer,
   datec          datetime,
-  tms            timestamp
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
index c30cc1c75dd..2c85521ea84 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commande_fournisseur_dispatch_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
index 6f72a447f10..40c5785dbad 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_extrafields.sql
@@ -23,7 +23,7 @@
 create table llx_commande_fournisseur_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
index 4c576f16f51..c75e9718526 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_log.sql
@@ -20,7 +20,7 @@
 create table llx_commande_fournisseur_log
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datelog          datetime NOT NULL,
   fk_commande      integer NOT NULL,
   fk_statut        smallint NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
index 189b4d7d593..cc22da09720 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseurdet_extrafields.sql
@@ -24,7 +24,7 @@
 create table llx_commande_fournisseurdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql b/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
index 37b7dd6a349..331a3fbe54a 100644
--- a/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_commandedet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_commandedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_comment.sql b/htdocs/install/mysql/tables/llx_comment.sql
index 22b2c40b9f1..3e839d83b4c 100644
--- a/htdocs/install/mysql/tables/llx_comment.sql
+++ b/htdocs/install/mysql/tables/llx_comment.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_comment (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
     datec datetime  DEFAULT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     description text NOT NULL,
     fk_user_author integer DEFAULT NULL,
     fk_user_modif integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_const.sql b/htdocs/install/mysql/tables/llx_const.sql
index fcca5f57023..96594bb60b4 100644
--- a/htdocs/install/mysql/tables/llx_const.sql
+++ b/htdocs/install/mysql/tables/llx_const.sql
@@ -32,7 +32,7 @@ create table llx_const
   type        varchar(64) DEFAULT 'string', -- null or 'encrypted' if param has been encrypted 
   visible     tinyint DEFAULT 1 NOT NULL,
   note        text,
-  tms         timestamp
+  tms         timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
 
 -- 
diff --git a/htdocs/install/mysql/tables/llx_contrat.sql b/htdocs/install/mysql/tables/llx_contrat.sql
index fbb36a5674b..dcdc1288d37 100644
--- a/htdocs/install/mysql/tables/llx_contrat.sql
+++ b/htdocs/install/mysql/tables/llx_contrat.sql
@@ -26,7 +26,7 @@ create table llx_contrat
   ref_supplier				varchar(255),		            -- supplier contract ref
   ref_ext					varchar(255),		            -- external contract ref
   entity					integer DEFAULT 1 NOT NULL,		-- multi company id
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec						datetime,                   	-- creation date
   date_contrat				datetime,
   statut					smallint DEFAULT 0,				-- not used. deprecated
diff --git a/htdocs/install/mysql/tables/llx_contrat_extrafields.sql b/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
index 7ab3dfbbdc9..f93ab94d4ca 100644
--- a/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_contrat_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_contrat_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
index 4705bbab218..bbe19955e33 100644
--- a/htdocs/install/mysql/tables/llx_contratdet.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet.sql
@@ -20,7 +20,7 @@
 create table llx_contratdet
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   fk_contrat            integer       NOT NULL,
   fk_product            integer       NULL,                -- doit pouvoir etre nul pour ligne detail sans produits
@@ -53,7 +53,7 @@ create table llx_contratdet
   total_localtax1       double(24,8)  DEFAULT 0,	   		   -- Total Local tax 1 de la ligne
   total_localtax2       double(24,8)  DEFAULT 0,	   		   -- Total Local tax 2 de la ligne
   total_ttc             double(24,8)  DEFAULT 0,	   		   -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
-  product_type			integer       DEFAULT 1,               -- Product type (1=service by default)
+  product_type			integer       DEFAULT 1,               -- Type of line (1=service by default)
   info_bits		        integer DEFAULT 0, 		               -- TVA NPR ou non
 
   buy_price_ht          double(24,8)  DEFAULT NULL,            -- buying price
diff --git a/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql b/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
index 8933fa66e16..ccd0846e81e 100644
--- a/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_contratdet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_contratdet_log.sql b/htdocs/install/mysql/tables/llx_contratdet_log.sql
index b13791f4832..f52ced561c7 100644
--- a/htdocs/install/mysql/tables/llx_contratdet_log.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet_log.sql
@@ -19,7 +19,7 @@
 create table llx_contratdet_log
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_contratdet         integer NOT NULL,
   date                  datetime NOT NULL,
   statut                smallint NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql
index 97057e6f41e..a9aa8960991 100644
--- a/htdocs/install/mysql/tables/llx_cronjob.sql
+++ b/htdocs/install/mysql/tables/llx_cronjob.sql
@@ -21,7 +21,7 @@
 CREATE TABLE llx_cronjob 
 (
 	rowid 			integer AUTO_INCREMENT PRIMARY KEY,
-	tms 			timestamp,
+	tms 			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 			datetime,
 	jobtype			varchar(10) NOT NULL,
   	label 			text NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement.sql
index 8b9fa2a04ae..50bfe8d7cfd 100644
--- a/htdocs/install/mysql/tables/llx_deplacement.sql
+++ b/htdocs/install/mysql/tables/llx_deplacement.sql
@@ -24,7 +24,7 @@ create table llx_deplacement
   ref				varchar(30) DEFAULT NULL,		-- Ref donation (TODO change to NOT NULL)
   entity			integer DEFAULT 1 NOT NULL,		-- multi company id
   datec				datetime NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dated				datetime,
   fk_user			integer NOT NULL,
   fk_user_author	integer,
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don.sql
index f03e82d6143..95181a3b30e 100644
--- a/htdocs/install/mysql/tables/llx_don.sql
+++ b/htdocs/install/mysql/tables/llx_don.sql
@@ -25,7 +25,7 @@ create table llx_don
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(30) DEFAULT NULL,     -- Ref donation (TODO change to NOT NULL)
   entity          integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_statut       smallint NOT NULL DEFAULT 0,  -- Status of donation promise or validate
   datedon         datetime,                     -- Date of the donation/promise
   amount          double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.sql b/htdocs/install/mysql/tables/llx_don_extrafields.sql
index bf2b780fcee..a4a560d0f8a 100644
--- a/htdocs/install/mysql/tables/llx_don_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_don_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_don_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories.sql b/htdocs/install/mysql/tables/llx_ecm_directories.sql
index 1fa1467e296..a02a72118b2 100644
--- a/htdocs/install/mysql/tables/llx_ecm_directories.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_directories.sql
@@ -30,7 +30,7 @@ CREATE TABLE llx_ecm_directories
   fullpath    		varchar(750),
   extraparams		varchar(255),					-- for stock other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  date_m			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text
diff --git a/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql b/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
index e2e496267ba..8bb7d98c592 100644
--- a/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_directories_extrafileds.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_ecm_directories_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                             -- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ecm_files.sql b/htdocs/install/mysql/tables/llx_ecm_files.sql
index c459e2ca219..030081b66b7 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files.sql
@@ -35,7 +35,7 @@ CREATE TABLE llx_ecm_files
   gen_or_uploaded   varchar(12),                    -- 'generated' or 'uploaded' 
   extraparams		varchar(255),					-- for stocking other parameters with json format
   date_c			datetime,
-  date_m			timestamp,
+  tms			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_c			integer,
   fk_user_m			integer,
   acl				text							-- for future permission 'per file'
diff --git a/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql
index 0cf0de6d375..485db3a0f72 100644
--- a/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_ecm_files_extrafields.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_ecm_files_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                             -- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_element_resources.sql b/htdocs/install/mysql/tables/llx_element_resources.sql
index 95ee9b5a751..693a2f990f0 100644
--- a/htdocs/install/mysql/tables/llx_element_resources.sql
+++ b/htdocs/install/mysql/tables/llx_element_resources.sql
@@ -28,5 +28,5 @@ CREATE TABLE llx_element_resources
   mandatory		  integer,
   duree				real,               -- total duration of using ressource
   fk_user_create  integer,
-  tms             timestamp
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
index 87581f418e8..389093241ce 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
@@ -35,7 +35,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
         note_public text, 
         note_private text, 
         date_creation datetime NOT NULL, 
-        tms timestamp, 
+        tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
         fk_user_creat integer NOT NULL, 
         fk_user_modif integer, 
         import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
index 226f74ce884..c45a3dcd1c4 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectoraction.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectoraction(
 	type varchar(128) NOT NULL, 
 	actionparam varchar(255) NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	position integer DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
index 5f49227f655..4e708116e21 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollectorfilter.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_emailcollector_emailcollectorfilter(
 	type varchar(128) NOT NULL, 
 	rulevalue varchar(128) NULL, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
index 2cabb457016..2a390f008e2 100644
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@@ -23,7 +23,7 @@ create table llx_entrepot
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(255) NOT NULL,
   datec           datetime,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   entity          integer DEFAULT 1 NOT NULL,	-- multi company id
   description     text,
   lieu            varchar(64),					-- resume lieu situation
diff --git a/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql b/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
index 9fa75455f19..95a78b4ce6c 100644
--- a/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_entrepot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_establishment.sql b/htdocs/install/mysql/tables/llx_establishment.sql
index 0d487e94e5f..7159a53059c 100644
--- a/htdocs/install/mysql/tables/llx_establishment.sql
+++ b/htdocs/install/mysql/tables/llx_establishment.sql
@@ -36,7 +36,7 @@ CREATE TABLE llx_establishment (
   fk_user_author 	integer NOT NULL,
   fk_user_mod		integer,
   datec				datetime NOT NULL,
-  tms				timestamp NOT NULL,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP NOT NULL,
   status            tinyint DEFAULT 1
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_events.sql b/htdocs/install/mysql/tables/llx_events.sql
index c3ae55f47e2..ffa4f1029e7 100644
--- a/htdocs/install/mysql/tables/llx_events.sql
+++ b/htdocs/install/mysql/tables/llx_events.sql
@@ -24,7 +24,7 @@
 create table llx_events
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
-  tms            timestamp,                   -- date creation/modification
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                   -- last modification date
   type           varchar(32)  NOT NULL,       -- action type
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   prefix_session varchar(255) NULL,				  -- prefix of session, obtained with dol_getprefix
diff --git a/htdocs/install/mysql/tables/llx_expedition.sql b/htdocs/install/mysql/tables/llx_expedition.sql
index e4c216f3da4..4214fef7f44 100644
--- a/htdocs/install/mysql/tables/llx_expedition.sql
+++ b/htdocs/install/mysql/tables/llx_expedition.sql
@@ -22,7 +22,7 @@
 create table llx_expedition
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expedition_extrafields.sql b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
index af4228efb41..6b9721a2826 100644
--- a/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expedition_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expedition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
index 112e41e9578..a71b45946a1 100644
--- a/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expeditiondet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expeditiondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expensereport.sql b/htdocs/install/mysql/tables/llx_expensereport.sql
index a212bc55273..772888620fb 100644
--- a/htdocs/install/mysql/tables/llx_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport.sql
@@ -34,8 +34,9 @@ CREATE TABLE llx_expensereport (
   date_approve		datetime,
   date_refuse 		datetime,
   date_cancel 		datetime,
-  tms 		 		timestamp,
+  tms 		 		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_author 	integer NOT NULL,				-- not the user author but the user the expense report is for
+  fk_user_creat 	integer DEFAULT NULL,			-- the use author
   fk_user_modif 	integer DEFAULT NULL,
   fk_user_valid 	integer DEFAULT NULL,
   fk_user_validator integer DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql b/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
index 8b6ad4e998f..1e78afb8513 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_expensereport_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_expensereport_ik.sql b/htdocs/install/mysql/tables/llx_expensereport_ik.sql
index ddc7fa4d3c7..839fbac8e9a 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_ik.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_ik.sql
@@ -21,7 +21,7 @@
 CREATE TABLE IF NOT EXISTS llx_expensereport_ik (
     rowid           integer  AUTO_INCREMENT PRIMARY KEY,
     datec           datetime  DEFAULT NULL,
-    tms             timestamp,
+    tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     fk_c_exp_tax_cat integer DEFAULT 0 NOT NULL,
     fk_range        integer DEFAULT 0 NOT NULL,	  	  
     coef            double DEFAULT 0 NOT NULL,  
diff --git a/htdocs/install/mysql/tables/llx_expensereport_rules.sql b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
index 2a10cc24a7d..ae8f9b09496 100644
--- a/htdocs/install/mysql/tables/llx_expensereport_rules.sql
+++ b/htdocs/install/mysql/tables/llx_expensereport_rules.sql
@@ -20,7 +20,7 @@
 CREATE TABLE llx_expensereport_rules (
   rowid						integer AUTO_INCREMENT PRIMARY KEY,
   datec						datetime  DEFAULT NULL,
-  tms						timestamp,
+  tms						timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dates						datetime NOT NULL,
   datee						datetime NOT NULL,
   amount					double(24,8) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 3578414d98b..1ade8502bf5 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -43,5 +43,5 @@ create table llx_extrafields
 	fk_user_author	integer,									-- user making creation
 	fk_user_modif	integer,	                                -- user making last change
 	datec			datetime,									-- date de creation
-	tms             timestamp									-- date of last update
+	tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP									-- last modification date
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 429095e1111..010cf1c1573 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -39,7 +39,7 @@ create table llx_facture
   datef					date,									-- date invoice
   date_pointoftax		date DEFAULT NULL,									-- date point of tax (for GB)
   date_valid			date,									-- date validation
-  tms					timestamp,								-- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,								-- last modification date
   date_closing				datetime,						-- date de cloture
   paye					smallint DEFAULT 0 NOT NULL,
   --amount				double(24,8)     DEFAULT 0 NOT NULL,
@@ -86,6 +86,8 @@ create table llx_facture
   fk_incoterms          integer,								-- for incoterms
   location_incoterms    varchar(255),							-- for incoterms
 
+  fk_mode_transport     integer,								-- for intracomm report
+
   situation_cycle_ref smallint,  -- situation cycle reference
   situation_counter   smallint,  -- situation counter
   situation_final     smallint,  -- is the situation final ?
diff --git a/htdocs/install/mysql/tables/llx_facture_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_extrafields.sql
index 4f7b902c97f..bc826d72ce4 100644
--- a/htdocs/install/mysql/tables/llx_facture_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
index 78b06370d8d..ef7e980b8aa 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql
@@ -35,7 +35,7 @@ create table llx_facture_fourn
   datef					date,                          -- date de la facture
   date_pointoftax		date DEFAULT NULL,			   -- date point of tax (for GB)
   date_valid			date,						   -- date validation
-  tms					timestamp,                     -- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                     -- last modification date
   libelle				varchar(255),
   paye					smallint         DEFAULT 0 NOT NULL,
   amount				double(24,8)     DEFAULT 0 NOT NULL,
@@ -70,6 +70,9 @@ create table llx_facture_fourn
   note_public			text,
   fk_incoterms          integer,						-- for incoterms
   location_incoterms    varchar(255),					-- for incoterms
+
+  fk_mode_transport     integer,						-- for intracomm report
+
   model_pdf				varchar(255),
   last_main_doc			varchar(255),					-- relative filepath+filename of last main generated document
 
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
index 7be8ff1c552..7fca2588bdf 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_fourn_det_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
index 8fb018cbfcc..48556ec6d33 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_fourn_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_rec.sql b/htdocs/install/mysql/tables/llx_facture_rec.sql
index 220c1fa608a..0db78d62252 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec.sql
@@ -26,7 +26,7 @@ create table llx_facture_rec
   entity             integer DEFAULT 1 NOT NULL,	 -- multi company id
   fk_soc             integer NOT NULL,
   datec              datetime,            -- date de creation
-  tms				 timestamp,           -- date creation/modification
+  tms				 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,           -- last modification date
 
   suspended          integer DEFAULT 0,					-- 1=suspended
   
diff --git a/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
index 6895a7e2291..8a51efb2914 100644
--- a/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facture_rec_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facture_rec_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql b/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
index 693abf00001..99f0b87a943 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facturedet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql b/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
index da2314ecffb..c220a7e0f0f 100644
--- a/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_facturedet_rec_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_facturedet_rec_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index e2508c372ca..7c1ef4cf184 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -26,7 +26,7 @@ create table llx_fichinter
   ref				varchar(30) NOT NULL,       -- number
   ref_ext			varchar(255),
   entity			integer DEFAULT 1 NOT NULL, -- multi company id
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,                   -- date de creation 
   date_valid		datetime,                   -- date de validation
   datei				date,						-- date de livraison du bon d'intervention
diff --git a/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
index 13c7dd15dab..c866669d667 100644
--- a/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_fichinter_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
index 65584c02201..f2ced33ec0d 100644
--- a/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_fichinterdet_extrafields.sql
@@ -19,7 +19,7 @@
 CREATE TABLE llx_fichinterdet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index e8116c477a8..3cd5727d867 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -42,7 +42,7 @@ fk_user_cancel integer DEFAULT NULL,
 detail_refuse  varchar( 250 ) DEFAULT NULL,
 note_private   text,
 note_public    text,
-tms            timestamp,
+tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 import_key			varchar(14),
 extraparams			varchar(255)				-- for other parameters with json format
 ) 
diff --git a/htdocs/install/mysql/tables/llx_holiday_extrafields.sql b/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
index 29881bbb0cb..8b6e3ef8dc9 100644
--- a/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_holiday_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_holiday_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_intracommreport.sql b/htdocs/install/mysql/tables/llx_intracommreport.sql
new file mode 100644
index 00000000000..9d89320c1fa
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_intracommreport.sql
@@ -0,0 +1,33 @@
+-- ===================================================================
+-- Copyright (C) 2015       ATM Consulting      <support@atm-consulting.fr>
+-- Copyright (C) 2019       Open-DSI			<support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <http://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+create table llx_intracommreport
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  
+  ref				varchar(30)        NOT NULL,			-- report reference number
+  entity			integer  DEFAULT 1 NOT NULL,			-- multi company id
+  type_declaration	varchar(32),
+  periods			varchar(32),
+  mode				varchar(32),
+  content_xml		text,
+  type_export		varchar(10),
+  datec             datetime,
+  tms               timestamp
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory.sql
index 4ccb234e26e..aa35ebb0c42 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_inventory
   entity integer DEFAULT 0, 
   ref varchar(48),
   date_creation datetime DEFAULT NULL,
-  tms timestamp, 
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
   fk_user_creat	integer,					-- user making creation
   fk_user_modif integer,                    -- user making last change
   fk_user_valid integer,                    -- valideur de la fiche
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index 8c770895194..ce23fe0f749 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_inventorydet
 ( 
 	rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY, 
 	datec datetime DEFAULT NULL,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_inventory integer DEFAULT 0, 
 	fk_warehouse integer DEFAULT 0,
 	fk_product integer DEFAULT 0,  
diff --git a/htdocs/install/mysql/tables/llx_livraison.sql b/htdocs/install/mysql/tables/llx_livraison.sql
index 31af38edfb6..e58e8c3c0bd 100644
--- a/htdocs/install/mysql/tables/llx_livraison.sql
+++ b/htdocs/install/mysql/tables/llx_livraison.sql
@@ -20,7 +20,7 @@
 create table llx_livraison
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)  NOT NULL,			-- delivery number
   entity                integer DEFAULT 1 NOT NULL,		-- multi company id
   fk_soc                integer      NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_livraison_extrafields.sql b/htdocs/install/mysql/tables/llx_livraison_extrafields.sql
index 70248d0ceca..d1fc611bfdd 100644
--- a/htdocs/install/mysql/tables/llx_livraison_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_livraison_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_livraison_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
index cb6300a8ca1..667f66ae0a8 100644
--- a/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_livraisondet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_livraisondet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan.sql
index a1a187b5ba4..f82597c71c5 100644
--- a/htdocs/install/mysql/tables/llx_loan.sql
+++ b/htdocs/install/mysql/tables/llx_loan.sql
@@ -22,7 +22,7 @@ create table llx_loan
   rowid							integer AUTO_INCREMENT PRIMARY KEY,
   entity						integer DEFAULT 1 NOT NULL,
   datec							datetime,
-  tms							timestamp,
+  tms							timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   label							varchar(80) NOT NULL,
   fk_bank						integer,
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule.sql
index e23bc678e71..dd68a426e61 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule.sql
@@ -22,7 +22,7 @@ create table llx_loan_schedule
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         -- creation date
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         -- payment date
   amount_capital	double(24,8) DEFAULT 0,
   amount_insurance	double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_localtax.sql b/htdocs/install/mysql/tables/llx_localtax.sql
index b7aa682567f..b883c710f7b 100644
--- a/htdocs/install/mysql/tables/llx_localtax.sql
+++ b/htdocs/install/mysql/tables/llx_localtax.sql
@@ -22,7 +22,7 @@ create table llx_localtax
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity          integer DEFAULT 1 NOT NULL,
   localtaxtype    tinyint,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           date,								-- date of payment
   datev           date,								-- date of value
   amount          double,
diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing.sql
index 8706159ad46..d9fc0832045 100644
--- a/htdocs/install/mysql/tables/llx_mailing.sql
+++ b/htdocs/install/mysql/tables/llx_mailing.sql
@@ -43,7 +43,7 @@ create table llx_mailing
   date_valid		datetime,                            -- 
   date_appro		datetime,                            -- 
   date_envoi		datetime,                            -- date d'envoi
-  tms				timestamp,  
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,  
   fk_user_creat		integer,                             -- user creator
   fk_user_valid		integer,                             -- user validator
   fk_user_appro		integer,                             -- not used
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
index b523c1d11eb..096142b10ad 100644
--- a/htdocs/install/mysql/tables/llx_mailing_cibles.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_cibles.sql
@@ -34,6 +34,6 @@ create table llx_mailing_cibles
   source_id			integer,
   source_type		varchar(16),
   date_envoi		datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   error_text		varchar(255)						-- text with error if statut is -1
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql b/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
index 00424256957..543015f5829 100644
--- a/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_unsubscribe.sql
@@ -26,5 +26,5 @@ create table llx_mailing_unsubscribe
   unsubscribegroup	varchar(128) DEFAULT '',
   ip				varchar(128),
   date_creat		datetime,                            -- creation date
-  tms               timestamp
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_menu.sql b/htdocs/install/mysql/tables/llx_menu.sql
index 4408cb69627..9cff110981a 100644
--- a/htdocs/install/mysql/tables/llx_menu.sql
+++ b/htdocs/install/mysql/tables/llx_menu.sql
@@ -39,8 +39,8 @@ CREATE TABLE llx_menu
 	langs         varchar(100),								-- Lang file to load for translation
 	level         smallint,									-- Deprecated. Not used.
 	perms         text,										-- Condition to show enabled or disabled
-	enabled       text NULL default '1', 		            -- Condition to show or hide
+	enabled       text NULL, 					            -- Condition to show or hide
 	usertype      integer NOT NULL DEFAULT 0,				-- 0 if menu for all users, 1 for external only, 2 for internal only
-	tms           timestamp
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 	
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo.sql b/htdocs/install/mysql/tables/llx_mrp_mo.sql
index d3aa294104b..de1933ccfed 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo.sql
@@ -27,7 +27,7 @@ CREATE TABLE llx_mrp_mo(
 	note_private text, 
 	date_creation datetime NOT NULL, 
 	date_valid datetime NULL,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer,
 	fk_user_valid integer,
diff --git a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
index 97eab584cc7..517c269cf0f 100644
--- a/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_mo_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_mrp_mo_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.sql b/htdocs/install/mysql/tables/llx_mrp_production.sql
index 509d78a5c0e..bd0cd722f1a 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production.sql
@@ -28,7 +28,7 @@ CREATE TABLE llx_mrp_production(
 	fk_mrp_production integer,		-- if role = 'consumed', id of line with role 'toconsume', if role = 'produced' id of line with role 'toproduce'
 	fk_stock_movement integer,		-- id of stock movement when movements are validated
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14)
diff --git a/htdocs/install/mysql/tables/llx_notify.sql b/htdocs/install/mysql/tables/llx_notify.sql
index 3ec7d05268e..d2e3bf93076 100644
--- a/htdocs/install/mysql/tables/llx_notify.sql
+++ b/htdocs/install/mysql/tables/llx_notify.sql
@@ -22,7 +22,7 @@
 create table llx_notify
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   daten           datetime,           -- date de la notification
   fk_action       integer NOT NULL,
   fk_soc          integer NULL,
diff --git a/htdocs/install/mysql/tables/llx_notify_def.sql b/htdocs/install/mysql/tables/llx_notify_def.sql
index bb516444b04..aed10027347 100644
--- a/htdocs/install/mysql/tables/llx_notify_def.sql
+++ b/htdocs/install/mysql/tables/llx_notify_def.sql
@@ -21,7 +21,7 @@
 create table llx_notify_def
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           date,             			-- date de creation
   fk_action       integer NOT NULL,
   fk_soc          integer,
diff --git a/htdocs/install/mysql/tables/llx_online_signatures.sql b/htdocs/install/mysql/tables/llx_online_signatures.sql
index 312cde50671..fbba814dd4d 100644
--- a/htdocs/install/mysql/tables/llx_online_signatures.sql
+++ b/htdocs/install/mysql/tables/llx_online_signatures.sql
@@ -22,7 +22,7 @@ create table llx_onlinesignature
   object_type               varchar(32) NOT NULL,
   object_id					integer NOT NULL,
   datec                     datetime NOT NULL,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   name						varchar(255) NOT NULL,
   ip						varchar(128),
   pathoffile				varchar(255)
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
index 3fcc5a0abf9..52d938b7c47 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_comments.sql
@@ -19,7 +19,7 @@ CREATE TABLE llx_opensurvey_comments (
     id_comment INTEGER unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
     id_sondage CHAR(16) NOT NULL,
     comment text NOT NULL,
-    tms timestamp,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     usercomment text
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
index a2ddafa1b54..03ad9b35ec5 100644
--- a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
+++ b/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
@@ -20,5 +20,5 @@ CREATE TABLE llx_opensurvey_user_studs (
     nom VARCHAR(64) NOT NULL,
     id_sondage VARCHAR(16) NOT NULL,
     reponses VARCHAR(100) NOT NULL,		-- Not used for 'F' surveys
-    tms timestamp
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql
index dabe261798b..bbf7d52e6c7 100644
--- a/htdocs/install/mysql/tables/llx_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_paiement.sql
@@ -25,7 +25,7 @@ create table llx_paiement
   ref_ext          varchar(255) NULL,                    -- payment external reference
   entity           integer   DEFAULT 1 NOT NULL,		-- Multi company id
   datec            datetime,							-- date de creation
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep            datetime,							-- payment date
   amount           double(24,8) DEFAULT 0,				-- amount paid in Dolibarr currency
   multicurrency_amount double(24,8) DEFAULT 0,			-- amount paid in invoice currency	
diff --git a/htdocs/install/mysql/tables/llx_paiementcharge.sql b/htdocs/install/mysql/tables/llx_paiementcharge.sql
index b489588777a..640f5f0af54 100644
--- a/htdocs/install/mysql/tables/llx_paiementcharge.sql
+++ b/htdocs/install/mysql/tables/llx_paiementcharge.sql
@@ -21,7 +21,7 @@ create table llx_paiementcharge
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_charge       integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepaiement integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_paiementfourn.sql b/htdocs/install/mysql/tables/llx_paiementfourn.sql
index 519526f764a..04066435f20 100644
--- a/htdocs/install/mysql/tables/llx_paiementfourn.sql
+++ b/htdocs/install/mysql/tables/llx_paiementfourn.sql
@@ -22,7 +22,7 @@ create table llx_paiementfourn
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   ref					varchar(30),
   entity				integer DEFAULT 1,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec					datetime,          -- date de creation de l'enregistrement
   datep					datetime,          -- date de paiement
   amount				double(24,8) DEFAULT 0,    -- montant
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index 6573bcb7119..088138bf96f 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -21,7 +21,7 @@ create table llx_payment_donation
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   fk_donation     integer,
   datec           datetime,           -- date de creation
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep           datetime,           -- payment date
   amount          double(24,8) DEFAULT 0,
   fk_typepayment  integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_payment_expensereport.sql b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
index 8a75bfcdbfd..a83c0c926a4 100644
--- a/htdocs/install/mysql/tables/llx_payment_expensereport.sql
+++ b/htdocs/install/mysql/tables/llx_payment_expensereport.sql
@@ -21,7 +21,7 @@ create table llx_payment_expensereport
   rowid                   integer AUTO_INCREMENT PRIMARY KEY,
   fk_expensereport        integer,
   datec                   datetime,           -- date de creation
-  tms                     timestamp,
+  tms                     timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep                   datetime,           -- payment date
   amount                  double(24,8) DEFAULT 0,
   fk_typepayment          integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_payment_loan.sql b/htdocs/install/mysql/tables/llx_payment_loan.sql
index a646ba1917b..0e080a1bdb7 100644
--- a/htdocs/install/mysql/tables/llx_payment_loan.sql
+++ b/htdocs/install/mysql/tables/llx_payment_loan.sql
@@ -22,7 +22,7 @@ create table llx_payment_loan
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   fk_loan			integer,
   datec				datetime,         -- creation date
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datep				datetime,         -- payment date
   amount_capital	double(24,8) DEFAULT 0,
   amount_insurance	double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_payment_salary.sql b/htdocs/install/mysql/tables/llx_payment_salary.sql
index cc4aaf94ccb..d6ad2ffcfed 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary.sql
@@ -20,7 +20,7 @@ create table llx_payment_salary
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   ref             varchar(30) NULL,           -- payment reference number (currently NULL because there is no numbering manager yet)
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   fk_user         integer NOT NULL,
   datep           date,                       -- payment date
diff --git a/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql b/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
index 3bfed602cff..5f15918ef18 100644
--- a/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_payment_salary_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_payment_salary_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- salary payment id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_payment_various.sql b/htdocs/install/mysql/tables/llx_payment_various.sql
index 4b48c649578..17bbf7c7a16 100644
--- a/htdocs/install/mysql/tables/llx_payment_various.sql
+++ b/htdocs/install/mysql/tables/llx_payment_various.sql
@@ -22,7 +22,7 @@ create table llx_payment_various
   ref                   varchar(30) NULL,           -- payment reference number (currently NULL because there is no numbering manager yet)
   num_payment           varchar(50),				-- num cheque or other
   label                 varchar(255),
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec                 datetime,                   -- Create date
   datep                 date,                       -- date de paiement
   datev                 date,                       -- date de valeur (this field should not be here, only into bank tables)
diff --git a/htdocs/install/mysql/tables/llx_printing.sql b/htdocs/install/mysql/tables/llx_printing.sql
index 0f0c7c71d1b..ecfe050240b 100644
--- a/htdocs/install/mysql/tables/llx_printing.sql
+++ b/htdocs/install/mysql/tables/llx_printing.sql
@@ -20,7 +20,7 @@
 CREATE TABLE llx_printing 
 (
  rowid integer AUTO_INCREMENT PRIMARY KEY,
- tms timestamp,
+ tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
  datec datetime,
  printer_name text NOT NULL, 
  printer_location text NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_product.key.sql b/htdocs/install/mysql/tables/llx_product.key.sql
index c3dd33c88c5..c0526a8f2cc 100644
--- a/htdocs/install/mysql/tables/llx_product.key.sql
+++ b/htdocs/install/mysql/tables/llx_product.key.sql
@@ -33,6 +33,7 @@ ALTER TABLE llx_product ADD INDEX idx_product_fk_barcode_type (fk_barcode_type);
 ALTER TABLE llx_product ADD INDEX idx_product_fk_project (fk_project);
 ALTER TABLE llx_product ADD UNIQUE INDEX uk_product_barcode (barcode, fk_barcode_type, entity);
 ALTER TABLE llx_product ADD CONSTRAINT fk_product_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+ALTER TABLE llx_product ADD CONSTRAINT fk_product_finished FOREIGN KEY (finished) REFERENCES llx_c_product_nature (code);
 
 ALTER TABLE  llx_product ADD CONSTRAINT fk_product_fk_country FOREIGN KEY (fk_country) REFERENCES  llx_c_country (rowid);
 ALTER TABLE  llx_product ADD CONSTRAINT fk_product_barcode_type FOREIGN KEY (fk_barcode_type) REFERENCES  llx_c_barcode_type (rowid);
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 714a342a652..2431c884c62 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -30,7 +30,7 @@ create table llx_product
   ref_ext                       varchar(128),                       -- reference into an external system (not used by dolibarr)
 
   datec                         datetime,
-  tms                           timestamp,
+  tms                           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_parent                     integer	  DEFAULT 0,                -- Not used. Used by external modules. Virtual product id
 
   label                         varchar(255) NOT NULL,
@@ -92,7 +92,7 @@ create table llx_product
   lifo                          double(24,8),                       -- To store valuation of stock calculated using lifo method, for this product. TODO Not used, should be replaced by stock value stored into movement table.
   fk_default_warehouse          integer      DEFAULT NULL,
   canvas                        varchar(32)  DEFAULT NULL,
-  finished                      tinyint      DEFAULT NULL,          -- 1=manufactured product, 0=matiere premiere
+  finished                      tinyint      DEFAULT NULL,          -- see dictionnary c_product_nature
   hidden                        tinyint      DEFAULT 0,             -- Not used. Deprecated.
   import_key                    varchar(14),                        -- Import key
   model_pdf                     varchar(255),                       -- model save dodument used
diff --git a/htdocs/install/mysql/tables/llx_product_batch.sql b/htdocs/install/mysql/tables/llx_product_batch.sql
index 9b736278e3a..7300c49874f 100644
--- a/htdocs/install/mysql/tables/llx_product_batch.sql
+++ b/htdocs/install/mysql/tables/llx_product_batch.sql
@@ -20,7 +20,7 @@
 
 CREATE TABLE llx_product_batch (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product_stock integer NOT NULL,
   eatby datetime DEFAULT NULL,			-- deprecated. should not be used here but should be stored into a table llx_product_lot
   sellby datetime DEFAULT NULL,			-- deprecated. should not be used here but should be stored into a table llx_product_lot
diff --git a/htdocs/install/mysql/tables/llx_product_customer_price.sql b/htdocs/install/mysql/tables/llx_product_customer_price.sql
index c7b6f1eb1a2..7cd481c3c75 100644
--- a/htdocs/install/mysql/tables/llx_product_customer_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_customer_price.sql
@@ -25,7 +25,7 @@ create table llx_product_customer_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer NOT NULL,
   fk_soc				integer NOT NULL,	   
   price						double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_product_extrafields.sql b/htdocs/install/mysql/tables/llx_product_extrafields.sql
index b265340d11c..24e53d9bda6 100644
--- a/htdocs/install/mysql/tables/llx_product_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_product_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 7e61a2df6b1..20d4db7492b 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -24,7 +24,7 @@ create table llx_product_fournisseur_price
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
   entity				integer DEFAULT 1 NOT NULL,	   -- multi company id
   datec					datetime,
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product			integer,
   fk_soc				integer,
   ref_fourn				varchar(30),
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
index 51d5499e825..728915521a7 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price_extrafields.sql
@@ -18,7 +18,7 @@
 
 Create Table llx_product_fournisseur_price_extrafields (
 	rowid               integer AUTO_INCREMENT PRIMARY KEY,
-	tms                 timestamp,
+	tms                 timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	fk_object           integer NOT NULL,
 	import_key          varchar(14) -- import key
 ) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_product_lot.sql b/htdocs/install/mysql/tables/llx_product_lot.sql
index 4d59a46c153..86cca7d0f04 100644
--- a/htdocs/install/mysql/tables/llx_product_lot.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot.sql
@@ -25,7 +25,7 @@ CREATE TABLE llx_product_lot (
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat integer,
   fk_user_modif integer,
   import_key    integer
diff --git a/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql b/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
index b3843ed9ba6..8fbbbde1bc5 100644
--- a/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_product_lot_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index 75a5355afe7..ff862e427e0 100644
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -25,7 +25,7 @@ create table llx_product_price
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer   DEFAULT 1 NOT NULL,		-- Multi company id
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product		integer NOT NULL,
   date_price		datetime NOT NULL,
   price_level		smallint NULL DEFAULT 1,
diff --git a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
index 7cb8b327b4d..dc3a21bfedb 100644
--- a/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
+++ b/htdocs/install/mysql/tables/llx_product_price_by_qty.sql
@@ -40,6 +40,6 @@ create table llx_product_price_by_qty
   multicurrency_price	double(24,8) DEFAULT NULL,
   multicurrency_price_ttc	double(24,8) DEFAULT NULL,
   
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key    	varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql
index 586c5b410c7..c5a2f4ad005 100644
--- a/htdocs/install/mysql/tables/llx_product_stock.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock.sql
@@ -21,7 +21,7 @@
 create table llx_product_stock
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      integer NOT NULL,
   fk_entrepot     integer NOT NULL,
   reel            real,           			-- physical stock
diff --git a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
index 903bd59b524..d6d5e57e549 100644
--- a/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock_entrepot.sql
@@ -21,7 +21,7 @@
 create table llx_product_warehouse_properties
 (
   rowid           		integer AUTO_INCREMENT PRIMARY KEY,
-  tms             		timestamp,
+  tms             		timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_product      		integer NOT NULL,
   fk_entrepot     		integer NOT NULL,
   seuil_stock_alerte    float DEFAULT '0',
diff --git a/htdocs/install/mysql/tables/llx_projet.sql b/htdocs/install/mysql/tables/llx_projet.sql
index f783597653f..a36adb3a672 100644
--- a/htdocs/install/mysql/tables/llx_projet.sql
+++ b/htdocs/install/mysql/tables/llx_projet.sql
@@ -22,7 +22,7 @@ create table llx_projet
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
   fk_soc           integer,
   datec            datetime,					-- date creation project
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   dateo            date,						-- date start project
   datee            date,						-- date end project
   ref              varchar(50),
diff --git a/htdocs/install/mysql/tables/llx_projet_extrafields.sql b/htdocs/install/mysql/tables/llx_projet_extrafields.sql
index 8a96a715b05..0001d4e8876 100644
--- a/htdocs/install/mysql/tables/llx_projet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_projet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_projet_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql
index cc1088cf7a7..01edb857738 100644
--- a/htdocs/install/mysql/tables/llx_projet_task.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task.sql
@@ -25,7 +25,7 @@ create table llx_projet_task
   fk_projet				integer NOT NULL,
   fk_task_parent		integer DEFAULT 0 NOT NULL,
   datec					datetime,						-- date creation
-  tms					timestamp,						-- date creation/modification
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,						-- last modification date
   dateo					datetime,						-- date start task
   datee					datetime,						-- date end task
   datev					datetime,						-- date validation
diff --git a/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql b/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
index 256c9025dc0..bf3d25e6922 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_projet_task_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index e1c857af2c3..786d8907588 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -29,7 +29,7 @@ create table llx_projet_task_time
   invoice_id       integer DEFAULT NULL,				-- If we need to invoice each line of timespent, we can save invoice id here
   invoice_line_id  integer DEFAULT NULL,                -- If we need to invoice each line of timespent, we can save invoice line id here
   import_key	   varchar(14),					-- Import key
-  datec            date,						-- Date creation time
-  tms              timestamp,					-- Date update time
+  datec            datetime,					-- date creation time
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					-- last modification date
   note             text							-- A comment
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index d21d9ef2d7e..662db791094 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -32,7 +32,7 @@ create table llx_propal
   fk_soc				integer,
   fk_projet				integer     DEFAULT NULL,		-- projet auquel est rattache la propale
 
-  tms					timestamp,
+  tms					timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec					datetime,						-- date de creation 
   datep					date,							-- date de la propal
   fin_validite			datetime,						-- date de fin de validite
diff --git a/htdocs/install/mysql/tables/llx_propal_extrafields.sql b/htdocs/install/mysql/tables/llx_propal_extrafields.sql
index f6ccb68b39b..31201e37b55 100644
--- a/htdocs/install/mysql/tables/llx_propal_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_propal_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_propal_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
index 0c636b2507c..b599702d560 100644
--- a/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
+++ b/htdocs/install/mysql/tables/llx_propal_merge_pdf_product.sql
@@ -22,7 +22,7 @@ CREATE TABLE llx_propal_merge_pdf_product (
   fk_user_author integer DEFAULT NULL,
   fk_user_mod integer NOT NULL,
   datec datetime NOT NULL,
-  tms timestamp NOT NULL,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql b/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
index 74986b1c641..7235d65eccd 100644
--- a/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_propaldet_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_propaldet_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- object id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_reception.sql b/htdocs/install/mysql/tables/llx_reception.sql
index 05ed6ca4604..71cc000ffc1 100644
--- a/htdocs/install/mysql/tables/llx_reception.sql
+++ b/htdocs/install/mysql/tables/llx_reception.sql
@@ -22,7 +22,7 @@
 create table llx_reception
 (
   rowid                 integer AUTO_INCREMENT PRIMARY KEY,
-  tms                   timestamp,
+  tms                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_reception_extrafields.sql b/htdocs/install/mysql/tables/llx_reception_extrafields.sql
index e2f83794a0b..13d3be5fe77 100644
--- a/htdocs/install/mysql/tables/llx_reception_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_reception_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_reception_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
index f135c1af72f..ded61d49e8b 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
@@ -24,7 +24,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
 	note_public text, 
 	note_private text, 
 	date_creation datetime NOT NULL,
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
index d0fb92fead9..77cf71b9b00 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_recruitment_recruitmentcandidature_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
index b342156ccd1..4ad1198d808 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
@@ -33,7 +33,7 @@ CREATE TABLE llx_recruitment_recruitmentjobposition(
 	note_public text, 
 	note_private text, 
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	last_main_doc varchar(255), 
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
index 07ae2ef5153..21b1ec081bf 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_recruitment_recruitmentjobposition_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_resource.sql b/htdocs/install/mysql/tables/llx_resource.sql
index 7dc709ad83a..30bd2bcbbf3 100644
--- a/htdocs/install/mysql/tables/llx_resource.sql
+++ b/htdocs/install/mysql/tables/llx_resource.sql
@@ -34,5 +34,5 @@ CREATE TABLE llx_resource
   import_key			varchar(14),
   extraparams			varchar(255),					-- for stock other parameters with json format
   fk_country          integer DEFAULT NULL,          -- Optional id of original country
-  tms         			  timestamp
+  tms         			  timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_resource_extrafields.sql b/htdocs/install/mysql/tables/llx_resource_extrafields.sql
index 6e828258339..88bcc7606c8 100644
--- a/htdocs/install/mysql/tables/llx_resource_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_resource_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_resource_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index a98be7912f7..ea02b7be8ad 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -92,8 +92,10 @@ create table llx_societe
   remise_supplier          real           DEFAULT 0,            		-- discount by default granted by this supplier
   mode_reglement           tinyint,                             		-- payment mode customer
   cond_reglement           tinyint,                             		-- payment term customer
+  transport_mode           tinyint,                             		-- transport mode customer (Intracomm report)
   mode_reglement_supplier  tinyint,                             		-- payment mode supplier
   cond_reglement_supplier  tinyint,                             		-- payment term supplier
+  transport_mode_supplier  tinyint,                             		-- transport mode supplier (Intracomm report)
   fk_shipping_method       integer,                                     -- preferred shipping method id
   tva_assuj                tinyint        DEFAULT 1,	        		-- assujeti ou non a la TVA
   localtax1_assuj          tinyint        DEFAULT 0,	        		-- assujeti ou non a local tax 1
@@ -114,7 +116,7 @@ create table llx_societe
   webservices_url          varchar(255),                            	-- supplier webservice url
   webservices_key          varchar(128),                            	-- supplier webservice key
 
-  tms                      timestamp,									-- last modification date
+  tms                      timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,									-- last modification date
   datec	                   datetime,                            		-- creation date
   fk_user_creat            integer NULL,                        		-- utilisateur qui a cree l'info
   fk_user_modif            integer,                             		-- utilisateur qui a modifie l'info
diff --git a/htdocs/install/mysql/tables/llx_societe_account.sql b/htdocs/install/mysql/tables/llx_societe_account.sql
index 6a78a9a7839..b200d4f3854 100644
--- a/htdocs/install/mysql/tables/llx_societe_account.sql
+++ b/htdocs/install/mysql/tables/llx_societe_account.sql
@@ -33,7 +33,7 @@ CREATE TABLE llx_societe_account(
 	date_last_login   datetime,
 	date_previous_login datetime,
 	date_creation datetime NOT NULL, 
-	tms timestamp, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
 	fk_user_creat integer NOT NULL, 
 	fk_user_modif integer, 
 	import_key varchar(14), 
diff --git a/htdocs/install/mysql/tables/llx_societe_address.sql b/htdocs/install/mysql/tables/llx_societe_address.sql
index 626b0155519..2b5f2d57146 100644
--- a/htdocs/install/mysql/tables/llx_societe_address.sql
+++ b/htdocs/install/mysql/tables/llx_societe_address.sql
@@ -21,7 +21,7 @@ create table llx_societe_address
 (
   rowid              integer AUTO_INCREMENT PRIMARY KEY,
   datec	             datetime,                            -- creation date
-  tms                timestamp,                           -- modification date
+  tms                timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,                           -- last modification date
   label              varchar(30),                         --
   fk_soc	         integer        DEFAULT 0,            --
   name               varchar(60),                         -- company name
diff --git a/htdocs/install/mysql/tables/llx_societe_extrafields.sql b/htdocs/install/mysql/tables/llx_societe_extrafields.sql
index e277db15821..a4b5b269358 100644
--- a/htdocs/install/mysql/tables/llx_societe_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_societe_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_societe_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_societe_prices.sql b/htdocs/install/mysql/tables/llx_societe_prices.sql
index 2b88340e611..2e9178774f5 100644
--- a/htdocs/install/mysql/tables/llx_societe_prices.sql
+++ b/htdocs/install/mysql/tables/llx_societe_prices.sql
@@ -20,7 +20,7 @@ create table llx_societe_prices
 (
   rowid              integer AUTO_INCREMENT PRIMARY KEY,
   fk_soc             integer   DEFAULT 0,
-  tms                timestamp, 
+  tms                timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
   datec	             datetime,
   fk_user_author     integer,
   price_level        tinyint   DEFAULT 1
diff --git a/htdocs/install/mysql/tables/llx_societe_remise.sql b/htdocs/install/mysql/tables/llx_societe_remise.sql
index a3a265cce5f..2d4e3a9c258 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise.sql
@@ -24,7 +24,7 @@ create table llx_societe_remise
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_client		double(6,3)  DEFAULT 0 NOT NULL,	-- discount
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
index 3786b16b76a..d6dfdc20d9d 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_supplier.sql
@@ -24,7 +24,7 @@ create table llx_societe_remise_supplier
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   entity			integer DEFAULT 1 NOT NULL,			-- multi company id
   fk_soc			integer NOT NULL,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,							-- creation date
   fk_user_author	integer,							-- creation user
   remise_supplier	double(6,3)  DEFAULT 0 NOT NULL,	-- discount
diff --git a/htdocs/install/mysql/tables/llx_societe_rib.sql b/htdocs/install/mysql/tables/llx_societe_rib.sql
index 7d00d9fb1dd..ece4b2edffe 100644
--- a/htdocs/install/mysql/tables/llx_societe_rib.sql
+++ b/htdocs/install/mysql/tables/llx_societe_rib.sql
@@ -27,7 +27,7 @@ create table llx_societe_rib
   label          varchar(200),
   fk_soc         integer NOT NULL,
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 
   -- For BAN
   bank           varchar(255),  -- bank name
diff --git a/htdocs/install/mysql/tables/llx_socpeople.sql b/htdocs/install/mysql/tables/llx_socpeople.sql
index 2a1b551beb9..decc229e3e7 100644
--- a/htdocs/install/mysql/tables/llx_socpeople.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople.sql
@@ -23,7 +23,7 @@ create table llx_socpeople
 (
   rowid				integer AUTO_INCREMENT PRIMARY KEY,
   datec				datetime,
-  tms				timestamp,
+  tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_soc			integer,									-- lien vers la societe
   entity			integer DEFAULT 1 NOT NULL,					-- multi company id
   ref_ext           varchar(255),                               -- reference into an external system (not used by dolibarr)
diff --git a/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql b/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
index 66220ce7e98..f2f594e12f3 100644
--- a/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_socpeople_extrafields.sql
@@ -19,7 +19,7 @@
 create table llx_socpeople_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
index 94501a516dd..2cd094c1b05 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
@@ -20,7 +20,7 @@
 create table llx_stock_mouvement
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datem           datetime,						-- Date and hour of movement
   fk_product      integer NOT NULL,				-- Id of product
   batch           varchar(128) DEFAULT NULL,	-- Lot or serial number
diff --git a/htdocs/install/mysql/tables/llx_subscription.sql b/htdocs/install/mysql/tables/llx_subscription.sql
index 03d24c68f6e..8e86e216d3f 100644
--- a/htdocs/install/mysql/tables/llx_subscription.sql
+++ b/htdocs/install/mysql/tables/llx_subscription.sql
@@ -19,7 +19,7 @@
 create table llx_subscription
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,
   fk_adherent     integer,
   fk_type         integer,
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal.sql b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
index 5e7393112d8..e63c4ff64c7 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_supplier_proposal (
   ref_int varchar(255) DEFAULT NULL,
   fk_soc integer DEFAULT NULL,
   fk_projet integer DEFAULT NULL,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec datetime DEFAULT NULL,
   date_valid datetime DEFAULT NULL,
   date_cloture datetime DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
index a13c74d0d04..8dfed18bbbc 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposal_extrafields.sql
@@ -17,7 +17,7 @@
 
 CREATE TABLE llx_supplier_proposal_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
index 0501aecc68b..df6b5216c21 100644
--- a/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_supplier_proposaldet_extrafields.sql
@@ -17,7 +17,7 @@
 
 CREATE TABLE llx_supplier_proposaldet_extrafields (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
-  tms timestamp,
+  tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object integer NOT NULL,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticket.sql b/htdocs/install/mysql/tables/llx_ticket.sql
index 4440bce5cec..c053e787dfa 100644
--- a/htdocs/install/mysql/tables/llx_ticket.sql
+++ b/htdocs/install/mysql/tables/llx_ticket.sql
@@ -39,6 +39,6 @@ CREATE TABLE llx_ticket
 	date_close datetime,
 	notify_tiers_at_create tinyint,
 	email_msgid varchar(255),				-- if ticket is created by email collector, we store here MSG ID
-	tms timestamp,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key        varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql b/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
index 538da09692e..31f82064461 100644
--- a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_ticket_extrafields.sql
@@ -18,7 +18,7 @@
 create table llx_ticket_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- ticket id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_tva.sql b/htdocs/install/mysql/tables/llx_tva.sql
index 2804d410e7d..6cf97e6b4c6 100644
--- a/htdocs/install/mysql/tables/llx_tva.sql
+++ b/htdocs/install/mysql/tables/llx_tva.sql
@@ -20,7 +20,7 @@
 create table llx_tva
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
-  tms             timestamp,
+  tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec           datetime,                   -- Create date
   datep           date,                       -- date de paiement
   datev           date,                       -- date de valeur
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index b49feba85d6..c734192ad64 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -29,7 +29,7 @@ create table llx_user
   fk_establishment  integer        DEFAULT 0,
 
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   login             varchar(50) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_user_employment.sql b/htdocs/install/mysql/tables/llx_user_employment.sql
index ff2a87028d4..c06df0189d2 100644
--- a/htdocs/install/mysql/tables/llx_user_employment.sql
+++ b/htdocs/install/mysql/tables/llx_user_employment.sql
@@ -25,7 +25,7 @@ create table llx_user_employment
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
   fk_user			integer,
   datec             datetime,
-  tms               timestamp,
+  tms               timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_user_creat     integer,
   fk_user_modif     integer,
   job				varchar(128),				-- job position. may be a dictionary
diff --git a/htdocs/install/mysql/tables/llx_user_extrafields.sql b/htdocs/install/mysql/tables/llx_user_extrafields.sql
index b7ba9116630..c38e9435a63 100644
--- a/htdocs/install/mysql/tables/llx_user_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_user_extrafields.sql
@@ -21,7 +21,7 @@
 create table llx_user_extrafields
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  tms              timestamp,
+  tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object        integer NOT NULL,    -- member id
   import_key       varchar(14)      	-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_user_rib.sql b/htdocs/install/mysql/tables/llx_user_rib.sql
index 1349e77a77b..4463a1f6f2b 100644
--- a/htdocs/install/mysql/tables/llx_user_rib.sql
+++ b/htdocs/install/mysql/tables/llx_user_rib.sql
@@ -22,7 +22,7 @@ create table llx_user_rib
   fk_user        integer      NOT NULL,
   entity         integer DEFAULT 1 NOT NULL,	-- multi company id
   datec          datetime,
-  tms            timestamp,
+  tms            timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   label          varchar(30),
   bank           varchar(255),  -- bank name
   code_banque    varchar(128),  -- bank code
diff --git a/htdocs/install/mysql/tables/llx_usergroup.sql b/htdocs/install/mysql/tables/llx_usergroup.sql
index 43bbba9dbb1..959dfbca3d9 100644
--- a/htdocs/install/mysql/tables/llx_usergroup.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup.sql
@@ -24,7 +24,7 @@ create table llx_usergroup
   nom           varchar(180) NOT NULL,
   entity        integer DEFAULT 1 NOT NULL,	-- multi company id
   datec         datetime,
-  tms           timestamp,
+  tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   note          text,
   model_pdf     varchar(255) DEFAULT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
index e2e96f142d9..ea358509eff 100644
--- a/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_usergroup_extrafields.sql
@@ -18,7 +18,7 @@
 
 CREATE TABLE llx_usergroup_extrafields (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website.sql
index 717052f795c..b2103177972 100644
--- a/htdocs/install/mysql/tables/llx_website.sql
+++ b/htdocs/install/mysql/tables/llx_website.sql
@@ -36,6 +36,6 @@ CREATE TABLE llx_website
     fk_user_modif integer,
     date_creation datetime,
     position      integer DEFAULT 0,
-	tms           timestamp,
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14)      -- import key	
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.sql b/htdocs/install/mysql/tables/llx_website_extrafields.sql
index ff39e2c51c4..b3fd6786a09 100644
--- a/htdocs/install/mysql/tables/llx_website_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_website_extrafields.sql
@@ -16,7 +16,7 @@
 CREATE TABLE llx_website_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          		-- import key
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website_page.sql b/htdocs/install/mysql/tables/llx_website_page.sql
index e2bec4a8a24..4b1b3045d6b 100644
--- a/htdocs/install/mysql/tables/llx_website_page.sql
+++ b/htdocs/install/mysql/tables/llx_website_page.sql
@@ -38,7 +38,7 @@ CREATE TABLE llx_website_page
     fk_user_modif integer,
     author_alias  varchar(64),
     date_creation datetime,
-	tms           timestamp,
+	tms           timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key    varchar(14),      -- import key
     object_type varchar(255),
     fk_object     varchar(255)
diff --git a/htdocs/install/mysql/tables/llx_zapier_hook.sql b/htdocs/install/mysql/tables/llx_zapier_hook.sql
index 27d56352bff..b54fbc0d348 100644
--- a/htdocs/install/mysql/tables/llx_zapier_hook.sql
+++ b/htdocs/install/mysql/tables/llx_zapier_hook.sql
@@ -22,8 +22,8 @@ CREATE TABLE llx_zapier_hook(
     module varchar(128),
     action varchar(128),
     status integer,
-    date_creation DATETIME NOT NULL,
+    date_creation datetime NOT NULL,
     fk_user integer NOT NULL,
-    tms TIMESTAMP NOT NULL,
+    tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key varchar(14)
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql b/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
index 09fef4cc399..0b4f6e97238 100644
--- a/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_zapier_hook_extrafields.sql
@@ -16,7 +16,7 @@
 create table llx_zapier_hook_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
-  tms                       timestamp,
+  tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   fk_object                 integer NOT NULL,
   import_key                varchar(14)                          -- import key
 ) ENGINE=innodb;
diff --git a/htdocs/intracommreport/admin/index.html b/htdocs/intracommreport/admin/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
new file mode 100644
index 00000000000..5c2246ec852
--- /dev/null
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -0,0 +1,208 @@
+<?php
+/* Copyright (C) 2015      ATM Consulting       <support@atm-consulting.fr>
+ * Copyright (C) 2019-2020 Open-DSI             <support@open-dsi.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file		htdocs/admin/intracommreport.php
+ *      \ingroup	intracommreport
+ *      \brief		Page to setup the module intracomm report
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/intracommreport.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("admin","intracommreport"));
+
+if (! $user->admin) accessforbidden();
+
+$action = GETPOST('action', 'aZ09');
+
+// Parameters INTRACOMMREPORT_* and others
+$list_DEB = array (
+    'INTRACOMMREPORT_NUM_AGREMENT',
+);
+
+$list_DES = array (
+    'INTRACOMMREPORT_NUM_DECLARATION',
+);
+
+if ($action == 'update') {
+    $error = 0;
+
+    if (! $error)
+    {
+        foreach ($list_DEB as $constname)
+        {
+            $constvalue = GETPOST($constname, 'alpha');
+
+            if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+                $error++;
+            }
+        }
+
+        foreach ($list_DES as $constname)
+        {
+            $constvalue = GETPOST($constname, 'alpha');
+
+            if (! dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+                $error++;
+            }
+        }
+
+        dolibarr_set_const($db, "INTRACOMMREPORT_TYPE_ACTEUR", GETPOST("INTRACOMMREPORT_TYPE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, "INTRACOMMREPORT_ROLE_ACTEUR", GETPOST("INTRACOMMREPORT_ROLE_ACTEUR", 'alpha'), 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION", 'alpha'), 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, "INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", GETPOST("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION", 'alpha'), 'chaine', 0, '', $conf->entity);
+        dolibarr_set_const($db, "INTRACOMMREPORT_CATEG_FRAISDEPORT", GETPOST("INTRACOMMREPORT_CATEG_FRAISDEPORT", 'alpha'), 'chaine', 0, '', $conf->entity);
+
+        if ($error) {
+            setEventMessages($langs->trans("Error"), null, 'errors');
+        }
+    }
+
+    if (! $error) {
+        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+    }
+}
+
+/*
+ * View
+ */
+
+$form=new Form($db);
+$formother=new FormOther($db);
+
+llxHeader('', $langs->trans("IntracommReportSetup"));
+
+$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+print load_fiche_titre($langs->trans("IntracommReportSetup"), $linkback, 'title_setup');
+
+$head = intracommReportAdminPrepareHead();
+
+dol_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, "intracommreport");
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print load_fiche_titre($langs->trans("Parameters").' (DEB)');
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print '</tr>';
+
+foreach ($list_DEB as $key)
+{
+    print '<tr class="oddeven value">';
+
+    // Param
+    $label = $langs->trans($key);
+    print '<td>'.$label.'</td>';
+    // Value
+    print '<td class="left">';
+    print '<input type="text" class="maxwidth100" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
+    print '</td>';
+
+    print '</tr>';
+}
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_TYPE_ACTEUR").'</td>';
+$arraychoices=array(''=>$langs->trans("None"), 'PSI'=>'Déclarant pour son compte', 'TDP'=>'Tiers déclarant');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_TYPE_ACTEUR', $arraychoices, $conf->global->INTRACOMMREPORT_TYPE_ACTEUR, 0);
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_ROLE_ACTEUR").'</td>';
+$arraychoices=array(''=>$langs->trans("None"), 'sender'=>'Emetteur', 'PSI'=>'Déclarant');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_ROLE_ACTEUR', $arraychoices, $conf->global->INTRACOMMREPORT_ROLE_ACTEUR, 0);
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION").'</td>';
+$arraychoices=array(1=>'Seuil de 460 000 €', 2=>'En dessous de 460 000 €');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION', $arraychoices, $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION, 0);
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION").'</td>';
+$arraychoices=array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
+print '<td>';
+print $form->selectarray('INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION', $arraychoices, $conf->global->INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION, 0);
+print '</td>';
+print "</tr>\n";
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("INTRACOMMREPORT_CATEG_FRAISDEPORT").'</td>';
+$arraychoices=array(3=>'Seuil de 460 000 €', 4=>'En dessous de 460 000 €');
+print '<td>';
+print $formother->select_categories(0, $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT, 'INTRACOMMREPORT_CATEG_FRAISDEPORT');
+print '</td>';
+print "</tr>\n";
+
+print '</table>';
+
+
+print load_fiche_titre($langs->trans("Parameters").' (DES)');
+
+print '<table class="noborder" width="100%">';
+print '<tr class="liste_titre">';
+print '<td>'.$langs->trans("Description").'</td>';
+print '<td>'.$langs->trans("Value").'</td>';
+print '</tr>';
+
+foreach ($list_DES as $key)
+{
+    print '<tr class="oddeven value">';
+
+    // Param
+    $label = $langs->trans($key);
+    print '<td>'.$label.'</td>';
+    // Value
+    print '<td class="left">';
+    print '<input type="text" class="maxwidth100" id="' . $key . '" name="' . $key . '" value="' . $conf->global->$key . '">';
+    print '</td>';
+
+    print '</tr>';
+}
+
+print '</table>';
+
+print '<div class="tabsAction">';
+print '<div class="inline-block divButAction">';
+print '<input type="submit" name="bt_save" class="butAction" value="'.$langs->trans('Save').'" />';
+print '</div>';
+print '</div>';
+
+print '</form>';
+
+dol_fiche_end();
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
new file mode 100644
index 00000000000..01cc99574f7
--- /dev/null
+++ b/htdocs/intracommreport/card.php
@@ -0,0 +1,330 @@
+<?php
+/* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
+ * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/intracommreport/card.php
+ *	\ingroup    Intracomm report
+ *	\brief      Page to manage intracomm report export
+ */
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/intracommreport/class/intracommreport.class.php';
+
+$langs->loadLangs(array("intracommreport"));
+
+$action = GETPOST('action');
+$exporttype = GETPOST('exporttype'); // DEB ou DES
+if (empty($exporttype)) $exporttype = 'deb';
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$year = GETPOST('year');
+$month = GETPOST('month');
+$type_declaration = GETPOST('type');
+$backtopage=GETPOST('backtopage', 'alpha');
+
+/*
+ * 	Actions
+ */
+
+if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes')
+{
+    $result=$object->delete($id, $user);
+    if ($result > 0)
+    {
+        if (! empty($backtopage))
+        {
+            header("Location: ".$backtopage);
+            exit;
+        }
+        else {
+            header("Location: list.php");
+            exit;
+        }
+    }
+    else {
+        $errmesg=$object->error;
+    }
+}
+
+if ($action == 'add' && $user->rights->intracommreport->write) {
+    $object->label			    = trim($label);
+    $object->type               = trim($type);
+    $object->type_declaration   = (int) $statut;
+    $object->subscription       = (int) $subscription;
+
+    // Fill array 'array_options' with data from add form
+    $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
+    if ($ret < 0) $error++;
+
+    if (empty($object->label)) {
+        $error++;
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
+    }
+    else {
+        $sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
+        $result = $db->query($sql);
+        if ($result) {
+            $num = $db->num_rows($result);
+        }
+        if ($num) {
+            $error++;
+            $langs->load("errors");
+            setEventMessages($langs->trans("ErrorLabelAlreadyExists", $login), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        $id=$object->create($user);
+        if ($id > 0)
+        {
+            header("Location: ".$_SERVER["PHP_SELF"]);
+            exit;
+        }
+        else {
+            setEventMessages($object->error, $object->errors, 'errors');
+            $action = 'create';
+        }
+    }
+    else {
+        $action = 'create';
+    }
+}
+
+/*
+ * View
+ */
+
+// Creation mode
+if ($action == 'create')
+{
+    $title = $langs->trans("IntracommReportTitle");
+    llxHeader("", $title);
+    print load_fiche_titre($langs->trans("IntracommReportTitle"));
+
+    print '<form name="charge" method="post" action="'.$_SERVER["PHP_SELF"].'">';
+    print '<input type="hidden" name="token" value="'.newToken().'">';
+    print '<input type="hidden" name="action" value="export" />';
+
+    dol_fiche_head();
+
+    print '<table class="border" width="100%">';
+
+    // Label
+    print '<tr><td class="titlefieldcreate">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
+
+    // Declaration
+    $declaration["deb"] = $langs->trans("DEB");
+    $declaration["des"] = $langs->trans("DES");
+    print '<tr><td class="fieldrequired">'.$langs->trans("Declaration")."</td><td>\n";
+    print $form->selectarray("declaration", $declaration, GETPOST('declaration', 'alpha')?GETPOST('declaration', 'alpha'):$object->declaration, 0);
+    print "</td>\n";
+
+    // Analysis period
+    print '<tr>';
+    print '<td class="titlefieldcreate fieldrequired">';
+    print $langs->trans("AnalysisPeriod");
+    print '</td>';
+    print '<td>';
+    print $formother->select_month($month ? date('M') : $month, 'month', 0, 1, 'widthauto valignmiddle ');
+    print $formother->select_year($year ? date('Y') : $year, 'year', 0, 3, 3);
+    print '</td>';
+    print '</tr>';
+
+    // Type of declaration
+    $typeOfDeclaration["introduction"] = $langs->trans("Introduction");
+    $typeOfDeclaration["expedition"] = $langs->trans("Expedition");
+    print '<tr><td class="fieldrequired">'.$langs->trans("TypeOfDeclaration")."</td><td>\n";
+    print $form->selectarray("type_declaration", $typeOfDeclaration, GETPOST('type_declaration', 'alpha')?GETPOST('type_declaration', 'alpha'):$object->type_declaration, 0);
+    print "</td>\n";
+
+    print '</table>';
+
+    dol_fiche_end();
+
+    print '<div class="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
+    print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
+    print '</div>';
+
+    print '</form>';
+}
+
+if ($id > 0 && $action != 'edit') {
+    /* ************************************************************************** */
+    /*                                                                            */
+    /* View mode                                                                  */
+    /*                                                                            */
+    /* ************************************************************************** */
+    $res = $object->fetch($id);
+    if ($res < 0) {
+        dol_print_error($db, $object->error);
+        exit;
+    }
+
+    /*
+     * Show tabs
+     */
+    $head = intracommreport_prepare_head($object);
+
+    dol_fiche_head($head, 'general', $langs->trans("IntracommReport"), -1, 'user');
+
+    // Confirm remove report
+    if ($action == 'delete') {
+        $formquestion = array();
+        if ($backtopage) {
+            $formquestion[] = array(
+                'type' => 'hidden',
+                'name' => 'backtopage',
+                'value' => ($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"])
+            );
+        }
+        print $form->formconfirm("card.php?rowid=" . $id, $langs->trans("DeleteReport"),
+            $langs->trans("ConfirmDeleteReport"), "confirm_delete", $formquestion, 'no', 1);
+    }
+
+    $linkback = '<a href="' . DOL_URL_ROOT . '/intracommreport/list.php?restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';
+
+    dol_banner_tab($object, 'rowid', $linkback);
+
+    print '<div class="fichecenter">';
+    print '<div class="fichehalfleft">';
+
+    print '<div class="underbanner clearboth"></div>';
+    print '<table class="border tableforfield centpercent">';
+
+    // Type
+    print '<tr><td class="titlefield">' . $langs->trans("Type") . '</td><td class="valeur">' . $object->declaration . "</td></tr>\n";
+
+    // Analysis Period
+    print '<tr><td>' . $langs->trans("AnalysisPeriod") . '</td><td class="valeur">' . $object->period . '</td>';
+    print '</tr>';
+
+    // Type of Declaration
+    print '<tr><td>' . $langs->trans("TypeOfDeclaration") . '</td><td class="valeur">' . $object->type_declaration . '</td>';
+    print '</tr>';
+
+    print "</table>\n";
+
+    print "</div></div></div>\n";
+    print '<div style="clear:both"></div>';
+
+    dol_fiche_end();
+}
+
+    /*
+    switch($action) {
+        case 'generateXML':
+            $obj = new TDebProdouane($PDOdb);
+            $obj->load($PDOdb, GETPOST('id_declaration'));
+            $obj->generateXMLFile();
+            break;
+        case 'list':
+            _liste($exporttype);
+            break;
+        case 'export':
+            if ($exporttype == 'deb') _export_xml_deb($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
+            else _export_xml_des($type_declaration, $year, str_pad($month, 2, 0, STR_PAD_LEFT));
+        default:
+            if ($exporttype == 'deb') _print_form_deb();
+            else _print_form_des();
+            break;
+    }
+
+    function _print_form_des()
+    {
+        global $langs, $formother, $year, $month, $type_declaration;
+
+        $title = $langs->trans("IntracommReportDESTitle");
+        llxHeader("", $title);
+        print load_fiche_titre($langs->trans("IntracommReportDESTitle"));
+
+        dol_fiche_head();
+
+        print '<form action="'.$_SERVER['PHP_SELF'].'" name="save" method="POST">';
+        print '<input type="hidden" name="token" value="'.newToken().'">';
+        print '<input type="hidden" name="action" value="export" />';
+        print '<input type="hidden" name="exporttype" value="des" />';
+        print '<input type="hidden" name="type" value="expedition" />'; // Permet d'utiliser le bon select de la requête sql
+
+        print '<table width="100%" class="noborder">';
+
+        print '<tr class="liste_titre"><td colspan="2">';
+        print 'Paramètres de l\'export';
+        print '</td></tr>';
+
+        print '<tr>';
+        print '<td>Période d\'analyse</td>';
+        print '<td>';
+        $TabMonth = array();
+        for($i=1;$i<=12;$i++) $TabMonth[$i] = $langs->trans('Month'.str_pad($i, 2, 0, STR_PAD_LEFT));
+        //print $ATMform->combo('','month', $TabMonth, empty($month) ? date('m') : $month);
+        print $formother->selectyear(empty($year) ? date('Y') : $year,'year',0, 20, 5);
+        print '</td>';
+        print '</tr>';
+
+        print '</table>';
+
+        print '<div class="tabsAction">';
+        print '<input class="butAction" type="submit" value="Exporter XML" />';
+        print '</div>';
+
+        print '</form>';
+    }
+
+    function _export_xml_deb($type_declaration, $period_year, $period_month) {
+
+        global $db, $conf;
+
+        $obj = new TDebProdouane($db);
+        $obj->entity = $conf->entity;
+        $obj->mode = 'O';
+        $obj->periode = $period_year.'-'.$period_month;
+        $obj->type_declaration = $type_declaration;
+        $obj->numero_declaration = $obj->getNextNumeroDeclaration();
+        $obj->content_xml = $obj->getXML('O', $type_declaration, $period_year.'-'.$period_month);
+        if(empty($obj->errors)) {
+            $obj->save($PDOdb);
+            $obj->generateXMLFile();
+        }
+        else setEventMessage($obj->errors, 'warnings');
+    }
+
+    function _export_xml_des($type_declaration, $period_year, $period_month) {
+
+        global $PDOdb, $conf;
+
+        $obj = new TDebProdouane($PDOdb);
+        $obj->entity = $conf->entity;
+        $obj->periode = $period_year.'-'.$period_month;
+        $obj->type_declaration = $type_declaration;
+        $obj->exporttype = 'des';
+        $obj->numero_declaration = $obj->getNextNumeroDeclaration();
+        $obj->content_xml = $obj->getXMLDes($period_year, $period_month, $type_declaration);
+        if(empty($obj->errors)) {
+            $obj->save($PDOdb);
+            $obj->generateXMLFile();
+        }
+        else setEventMessage($obj->errors, 'warnings');
+    }
+    */
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/intracommreport/class/index.html b/htdocs/intracommreport/class/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
new file mode 100644
index 00000000000..b07d26150d6
--- /dev/null
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -0,0 +1,423 @@
+<?php
+/* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
+ * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/intracommreport/class/intracommreport.class.php
+ *  \ingroup    Intracomm report
+ *  \brief      File of class to manage intracomm report
+ */
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+/**
+ * Class to manage intracomm report
+ */
+class IntracommReport extends CommonObject
+{
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element='intracommreport';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element='intracommreport';
+
+    /**
+     * @var int Field with ID of parent key if this field has a parent
+     */
+    public $fk_element='fk_intracommreport';
+
+    /**
+     * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     * @var int
+     */
+    public $ismultientitymanaged = 1;
+
+    /**
+     * DEB - Product
+     */
+    const TYPE_DEB = 0;
+
+    /**
+     * DES - Service
+     */
+    const TYPE_DES = 1;
+
+	static $type = array(
+	    'introduction'=>'Introduction'
+		,'expedition'=>'Expédition'
+    );
+
+    /**
+     * Constructor
+     *
+     * @param DoliDB $db Database handle
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+		$this->exporttype = 'deb';
+	}
+
+	/**
+	 * Generate XML file
+	 *
+	 * @param int		$mode 				O for create, R for regenerate (Look always 0 ment toujours 0 within the framework of XML exchanges according to documentation)
+	 * @param string	$type 				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 * @param string	$period_reference	Period of reference
+	 * @return void
+	 */
+	public function getXML($mode = 'O', $type = 'introduction', $period_reference = '')
+	{
+
+		global $conf, $mysoc;
+
+		/**************Construction de quelques variables********************/
+		$party_id = substr(strtr($mysoc->tva_intra, array(' '=>'')), 0, 4).$mysoc->idprof2;
+		$declarant = substr($mysoc->managers, 0, 14);
+		$id_declaration = self::getNumeroDeclaration($this->numero_declaration);
+		/********************************************************************/
+
+		/**************Construction du fichier XML***************************/
+		$e = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" standalone="yes"?><INSTAT></INSTAT>');
+
+		$enveloppe = $e->addChild('Envelope');
+		$enveloppe->addChild('envelopeId', $conf->global->INTRACOMMREPORT_NUM_AGREMENT);
+		$date_time = $enveloppe->addChild('DateTime');
+		$date_time->addChild('date', date('Y-m-d'));
+		$date_time->addChild('time', date('H:i:s'));
+		$party = $enveloppe->addChild('Party');
+		$party->addAttribute('partType', $conf->global->INTRACOMMREPORT_TYPE_ACTEUR);
+		$party->addAttribute('partyRole', $conf->global->INTRACOMMREPORT_ROLE_ACTEUR);
+		$party->addChild('partyId', $party_id);
+		$party->addChild('partyName', $declarant);
+		$enveloppe->addChild('softwareUsed', 'Dolibarr');
+		$declaration = $enveloppe->addChild('Declaration');
+		$declaration->addChild('declarationId', $id_declaration);
+		$declaration->addChild('referencePeriod', $period_reference);
+		if ($conf->global->INTRACOMMREPORT_TYPE_ACTEUR === 'PSI') $psiId = $party_id;
+		else $psiId = 'NA';
+		$declaration->addChild('PSIId', $psiId);
+		$function = $declaration->addChild('Function');
+		$functionCode = $function->addChild('functionCode', $mode);
+		$declaration->addChild('declarationTypeCode', $conf->global->{'INTRACOMMREPORT_NIV_OBLIGATION_'.strtoupper($type)});
+		$declaration->addChild('flowCode', ($type == 'introduction' ? 'A' : 'D'));
+		$declaration->addChild('currencyCode', $conf->global->MAIN_MONNAIE);
+		/********************************************************************/
+
+		/**************Ajout des lignes de factures**************************/
+		$res = self::addItemsFact($declaration, $type, $period_reference);
+		/********************************************************************/
+
+		$this->errors = array_unique($this->errors);
+
+		if (!empty($res)) return $e->asXML();
+		else return 0;
+	}
+
+	/**
+	 * Generate XMLDes file
+	 *
+	 * @param int		$period_year		Year of declaration
+	 * @param int		$period_month		Month of declaration
+	 * @param string	$type_declaration	Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 * @return void
+	 */
+	public function getXMLDes($period_year, $period_month, $type_declaration = 'expedition')
+	{
+		global $mysoc;
+
+		$e = new SimpleXMLElement('<?xml version="1.0" encoding="utf-8" ?><fichier_des></fichier_des>');
+
+		$declaration_des = $e->addChild('declaration_des');
+		$declaration_des->addChild('num_des', self::getDeclarationNumber($this->numero_declaration));
+		$declaration_des->addChild('num_tvaFr', $mysoc->tva_intra); // /^FR[a-Z0-9]{2}[0-9]{9}$/  // Doit faire 13 caractères
+		$declaration_des->addChild('mois_des', $period_month);
+		$declaration_des->addChild('an_des', $period_year);
+
+		/**************Ajout des lignes de factures**************************/
+		$res = self::addItemsFact($declaration_des, $type_declaration, $period_year.'-'.$period_month, 'des');
+		/********************************************************************/
+
+		$this->errors = array_unique($this->errors);
+
+		if (!empty($res)) return $e->asXML();
+		else return 0;
+	}
+
+	/**
+	 *  Add line from invoice
+	 *
+	 *  @param      int		$declaration		Reference declaration
+	 *  @param      string	$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param      int		$period_reference	Reference period
+	 *  @param      string	$exporttype	    	deb=DEB, des=DES
+	 *  @return     int       			  		<0 if KO, >0 if OK
+	 */
+	public function addItemsFact(&$declaration, $type, $period_reference, $exporttype = 'deb')
+	{
+		global $conf;
+
+		require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+
+		$sql = $this->getSQLFactLines($type, $period_reference, $exporttype);
+
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			$i=1;
+
+			if (empty($resql->num_rows)) {
+				$this->errors[] = 'No data for this period';
+				return 0;
+			}
+
+			if ($exporttype == 'deb' && $conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0) {
+				$categ_fraisdeport = new Categorie();
+				$categ_fraisdeport->fetch($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT);
+				$TLinesFraisDePort = array();
+			}
+
+			while ($res = $this->db->fetch_object($resql)) {
+				if ($exporttype == 'des')
+				{
+					$this->addItemXMlDes($declaration, $res, $i);
+				} else {
+					if (empty($res->fk_pays)) {
+						// We don't stop the loop because we want to know all the third parties who don't have an informed country
+						$this->errors[] = 'Country not filled in for the third party <a href="'.dol_buildpath('/societe/soc.php', 1).'?socid='.$res->id_client.'">'.$res->nom.'</a>';
+					} else {
+						if ($conf->global->INTRACOMMREPORT_CATEG_FRAISDEPORT > 0 && $categ_fraisdeport->containsObject('product', $res->id_prod)) {
+							$TLinesFraisDePort[] = $res;
+						} else $this->addItemXMl($declaration, $res, $i, '');
+					}
+				}
+
+				$i++;
+			}
+
+			if (!empty($TLinesFraisDePort)) $this->addItemFraisDePort($declaration, $TLinesFraisDePort, $type, $categ_fraisdeport, $i);
+
+			if (count($this->errors) > 0) return 0;
+		}
+
+		return 1;
+	}
+
+	/**
+	 *  Add invoice line
+	 *
+	 *  @param      string	$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param      int		$period_reference	Reference declaration
+	 *  @param      string	$exporttype	    	deb=DEB, des=DES
+	 *  @return     int       			  		<0 if KO, >0 if OK
+	 */
+	public function getSQLFactLines($type, $period_reference, $exporttype = 'deb')
+	{
+		global $mysoc, $conf;
+
+		if ($type=='expedition' || $exporttype=='des') {
+			$sql = 'SELECT f.facnumber, f.total as total_ht';
+			$table = 'facture';
+			$table_extraf = 'facture_extrafields';
+			$tabledet = 'facturedet';
+			$field_link = 'fk_facture';
+		}
+		else { // Introduction
+			$sql = 'SELECT f.ref_supplier as facnumber, f.total_ht';
+			$table = 'facture_fourn';
+			$table_extraf = 'facture_fourn_extrafields';
+			$tabledet = 'facture_fourn_det';
+			$field_link = 'fk_facture_fourn';
+		}
+		$sql.= ', l.fk_product, l.qty
+				, p.weight, p.rowid as id_prod, p.customcode
+				, s.rowid as id_client, s.nom, s.zip, s.fk_pays, s.tva_intra
+				, c.code
+				, ext.mode_transport
+				FROM '.MAIN_DB_PREFIX.$tabledet.' l
+				INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = l.'.$field_link.')
+				LEFT JOIN '.MAIN_DB_PREFIX.$table_extraf.' ext ON (ext.fk_object = f.rowid)
+				INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = l.fk_product)
+				INNER JOIN '.MAIN_DB_PREFIX.'societe s ON (s.rowid = f.fk_soc)
+				LEFT JOIN '.MAIN_DB_PREFIX.'c_country c ON (c.rowid = s.fk_pays)
+				WHERE f.fk_statut > 0
+				AND l.product_type = '.($exporttype == 'des' ? 1 : 0).'
+				AND f.entity = '.$conf->entity.'
+				AND (s.fk_pays <> '.$mysoc->country_id.' OR s.fk_pays IS NULL)
+				AND f.datef BETWEEN "'.$period_reference.'-01" AND "'.$period_reference.'-'.date('t').'"';
+
+		return $sql;
+	}
+
+	/**
+	 *	Add item for DEB
+	 *
+	 * 	@param      int		$declaration		Reference declaration
+	 * 	@param      int		$res				Result of request SQL
+	 *  @param      int		$i					Line Id
+	 * 	@param      string	$code_douane_spe	Specific customs authorities code
+	 *  @return     void
+	 */
+	public function addItemXMl(&$declaration, &$res, $i, $code_douane_spe = '')
+	{
+		$item = $declaration->addChild('Item');
+		$item->addChild('ItemNumber', $i);
+		$cn8 = $item->addChild('CN8');
+		if (empty($code_douane_spe)) $code_douane = $res->customcode;
+		else $code_douane = $code_douane_spe;
+		$cn8->addChild('CN8Code', $code_douane);
+		if (!empty($res->tva_intra)) $item->addChild('partnerId', $res->tva_intra);
+		$item->addChild('MSConsDestCode', $res->code); // code iso pays client
+		$item->addChild('netMass', $res->weight * $res->qty); // Poids du produit
+		$item->addChild('quantityInSU', $res->qty); // Quantité de produit dans la ligne
+		$item->addChild('invoicedAmount', round($res->total_ht)); // Montant total ht de la facture (entier attendu)
+		$item->addChild('invoicedNumber', $res->facnumber); // Numéro facture
+		$item->addChild('statisticalProcedureCode', '11');
+		$nature_of_transaction = $item->addChild('NatureOfTransaction');
+		$nature_of_transaction->addChild('natureOfTransactionACode', 1);
+		$nature_of_transaction->addChild('natureOfTransactionBCode', 1);
+		$item->addChild('modeOfTransportCode', $res->mode_transport);
+		$item->addChild('regionCode', substr($res->zip, 0, 2));
+	}
+
+	/**
+	 *	Add item for DES
+	 *
+	 * 	@param      int		$declaration		Reference declaration
+	 * 	@param      int		$res				Result of request SQL
+	 *  @param      int		$i					Line Id
+	 *  @return     void
+	 */
+	public function addItemXMlDes($declaration, &$res, $i)
+	{
+		$item = $declaration->addChild('ligne_des');
+		$item->addChild('numlin_des', $i);
+		$item->addChild('valeur', round($res->total_ht)); // Total amount excl. tax of the invoice (whole amount expected)
+		$item->addChild('partner_des', $res->tva_intra); // Represents the foreign customer's VAT number
+	}
+
+	/**
+	 *	This function adds an item by retrieving the customs code of the product with the highest amount in the invoice
+	 *
+	 * 	@param      int		$declaration		Reference declaration
+	 * 	@param      int		$TLinesFraisDePort	Data of shipping costs line
+	 *  @param      string	$type				Declaration type by default - introduction or expedition (always 'expedition' for Des)
+	 *  @param      int		$categ_fraisdeport	Id of category of shipping costs
+	 *  @param      int		$i					Line Id
+	 *  @return     void
+	 */
+	public function addItemFraisDePort(&$declaration, &$TLinesFraisDePort, $type, &$categ_fraisdeport, $i)
+	{
+
+		global $conf;
+
+		if ($type=='expedition') {
+			$table = 'facture';
+			$tabledet = 'facturedet';
+			$field_link = 'fk_facture';
+			$more_sql = 'f.facnumber';
+		} else { // Introduction
+			$table = 'facture_fourn';
+			$tabledet = 'facture_fourn_det';
+			$field_link = 'fk_facture_fourn';
+			$more_sql = 'f.ref_supplier';
+		}
+
+		foreach ($TLinesFraisDePort as $res) {
+			$sql = 'SELECT p.customcode
+					FROM '.MAIN_DB_PREFIX.$tabledet.' d
+					INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = d.'.$field_link.')
+					INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = d.fk_product)
+					WHERE d.fk_product IS NOT NULL
+					AND f.entity = '.$conf->entity.'
+					AND '.$more_sql.' = "'.$res->facnumber.'"
+					AND d.total_ht =
+					(
+						SELECT MAX(d.total_ht)
+						FROM '.MAIN_DB_PREFIX.$tabledet.' d
+						INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = d.'.$field_link.')
+						WHERE d.fk_product IS NOT NULL
+						AND '.$more_sql.' = "'.$res->facnumber.'"
+						AND d.fk_product NOT IN
+						(
+							SELECT fk_product
+							FROM '.MAIN_DB_PREFIX.'categorie_product
+							WHERE fk_categorie = '.$categ_fraisdeport->id.'
+						)
+					)';
+
+			$resql = $this->db->query($sql);
+			$ress = $this->db->fetch_object($resql);
+
+			$this->addItemXMl($declaration, $res, $i, $ress->customcode);
+
+			$i++;
+		}
+	}
+
+	/**
+	 *	Return next reference of declaration not already used (or last reference)
+	 *
+	 *	@return    string					free ref or last ref
+	 */
+	public function getNextDeclarationNumber()
+	{
+		$resql = $this->db->query('SELECT MAX(numero_declaration) as max_numero_declaration FROM '.$this->get_table().' WHERE exporttype="'.$this->exporttype.'"');
+		if ($resql) $res = $this->db->fetch_object($resql);
+
+		return ($res->max_numero_declaration + 1);
+	}
+
+	/**
+	 *	Verify declaration number. Positive integer of a maximum of 6 characters recommended by the documentation
+	 *
+	 *	@param     	int		$number		Number to verify / convert
+	 *	@return		int 				Number
+	 */
+	public static function getDeclarationNumber($number)
+	{
+		return str_pad($number, 6, 0, STR_PAD_LEFT);
+	}
+
+	/**
+	 *	Generate XML file
+	 *
+	 *	@return		void
+	 */
+	public function generateXMLFile()
+	{
+
+		$name = $this->periode.'.xml';
+		$fname = sys_get_temp_dir().'/'.$name;
+		$f = fopen($fname, 'w+');
+		fwrite($f, $this->content_xml);
+		fclose($f);
+
+		header('Content-Description: File Transfer');
+	    header('Content-Type: application/xml');
+	    header('Content-Disposition: attachment; filename="'.$name.'"');
+	    header('Expires: 0');
+	    header('Cache-Control: must-revalidate');
+	    header('Pragma: public');
+	    header('Content-Length: ' . filesize($fname));
+	    readfile($fname);
+		exit;
+	}
+}
diff --git a/htdocs/intracommreport/index.html b/htdocs/intracommreport/index.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
new file mode 100644
index 00000000000..6f7ecbc2580
--- /dev/null
+++ b/htdocs/intracommreport/list.php
@@ -0,0 +1,492 @@
+<?php
+/* Copyright (C) 2015       ATM Consulting          <support@atm-consulting.fr>
+ * Copyright (C) 2019-2020  Open-DSI                <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/intracommreport/list.php
+ *  \ingroup    Intracomm Report
+ *  \brief      Page to list intracomm report
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('intracommreport'));
+
+$action=GETPOST('action', 'alpha');
+$massaction=GETPOST('massaction', 'alpha');
+$show_files=GETPOST('show_files', 'int');
+$confirm=GETPOST('confirm', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+
+$sall=trim((GETPOST('search_all', 'alphanohtml')!='')?GETPOST('search_all', 'alphanohtml'):GETPOST('sall', 'alphanohtml'));
+$search_ref=GETPOST("search_ref", 'alpha');
+$search_type = GETPOST("search_type", 'int');
+$fourn_id = GETPOST("fourn_id", 'int');
+$catid = GETPOST('catid', 'int');
+$optioncss = GETPOST('optioncss', 'alpha');
+$type=GETPOST("type", "int");
+
+$diroutputmassaction=$conf->product->dir_output . '/temp/massgeneration/'.$user->id;
+
+$limit = GETPOST('limit', 'int')?GETPOST('limit', 'int'):$conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = (GETPOST("page", 'int')?GETPOST("page", 'int'):0);
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (! $sortfield) $sortfield="i.ref";
+if (! $sortorder) $sortorder="ASC";
+
+// Initialize context for list
+$contextpage=GETPOST('contextpage', 'aZ')?GETPOST('contextpage', 'aZ'):'intracommreportlist';
+if ((string) $type == '1') { $contextpage='DESlist'; if ($search_type=='') $search_type='1'; }
+if ((string) $type == '0') { $contextpage='DEBlist'; if ($search_type=='') $search_type='0'; }
+
+// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
+$object=new IntracommReport($db);
+$hookmanager->initHooks(array('intracommreportlist'));
+$extrafields = new ExtraFields($db);
+$form=new Form($db);
+
+/*
+// fetch optionals attributes and labels
+$extralabels = $extrafields->fetch_name_optionals_label('intracommreport');
+$search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+*/
+
+if (empty($action)) $action='list';
+
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$canvas=GETPOST("canvas");
+$objcanvas=null;
+if (! empty($canvas))
+{
+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+    $objcanvas = new Canvas($db, $action);
+    $objcanvas->getCanvas('product', 'list', $canvas);
+}
+
+// Security check
+/*
+if ($search_type=='0') $result=restrictedArea($user, 'produit', '', '', '', '', '', $objcanvas);
+elseif ($search_type=='1') $result=restrictedArea($user, 'service', '', '', '', '', '', $objcanvas);
+else $result=restrictedArea($user, 'produit|service', '', '', '', '', '', $objcanvas);
+*/
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+    'i.ref'=>"Ref",
+    'pfi.ref_fourn'=>"RefSupplier",
+    'i.label'=>"ProductLabel",
+    'i.description'=>"Description",
+    "i.note"=>"Note",
+);
+
+$isInEEC=isInEEC($mysoc);
+
+// Definition of fields for lists
+$arrayfields=array(
+    'i.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
+    'i.label'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
+    'i.fk_product_type'=>array('label'=>$langs->trans("Type"), 'checked'=>0, 'enabled'=>(! empty($conf->produit->enabled) && ! empty($conf->service->enabled))),
+);
+/*
+// Extra fields
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']))
+{
+    foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
+    {
+        if (! empty($extrafields->attributes[$object->table_element]['list'][$key]))
+            $arrayfields["ef.".$key]=array('label'=>$extrafields->attributes[$object->table_element]['label'][$key], 'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key]<0)?0:1), 'position'=>$extrafields->attributes[$object->table_element]['pos'][$key], 'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key])!=3 && $extrafields->attributes[$object->table_element]['perms'][$key]));
+    }
+}
+*/
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action='list'; $massaction=''; }
+if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction=''; }
+
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook))
+{
+    // Selection of new fields
+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+    // Purge search criteria
+    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+    {
+        $sall="";
+        $search_ref="";
+        $search_label="";
+        //$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
+
+        $show_childproducts = '';
+        $search_array_options=array();
+    }
+
+    // Mass actions
+    $objectclass='Product';
+    if ((string) $search_type == '1') { $objectlabel='Services'; }
+    if ((string) $search_type == '0') { $objectlabel='Products'; }
+
+    $permtoread = $user->rights->produit->lire;
+    $permtodelete = $user->rights->produit->supprimer;
+    $uploaddir = $conf->product->dir_output;
+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+/*
+ * View
+ */
+$formother=new FormOther($db);
+
+$title=$langs->trans('IntracommReportList'.$type);
+
+$sql = 'SELECT DISTINCT i.rowid, i.type_declaration, i.type_export, i.period, i.mode, i.entity';
+/*
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+}
+*/
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
+$sql.= ' FROM '.MAIN_DB_PREFIX.'intracommreport as i';
+
+// if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."intracommreport_extrafields as ef on (i.rowid = ef.fk_object)";
+
+$sql.= ' WHERE i.entity IN ('.getEntity('intracommreport').')';
+
+if ($sall) $sql .= natural_search(array_keys($fieldstosearchall), $sall);
+// if the type is not 1, we show all products (type = 0,2,3)
+if (dol_strlen($search_type) && $search_type != '-1')
+{
+    if ($search_type == 1) $sql.= " AND i.type = 1";
+    else $sql.= " AND i.type = 0";
+}
+
+/*
+if ($search_ref)     $sql .= natural_search('i.ref', $search_ref);
+if ($search_label)   $sql .= natural_search('i.label', $search_label);
+if ($search_barcode) $sql .= natural_search('i.barcode', $search_barcode);
+if (isset($search_tosell) && dol_strlen($search_tosell) > 0  && $search_tosell!=-1) $sql.= " AND i.tosell = ".$db->escape($search_tosell);
+if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0  && $search_tobuy!=-1)   $sql.= " AND i.tobuy = ".$db->escape($search_tobuy);
+if (dol_strlen($canvas) > 0)                    $sql.= " AND i.canvas = '".$db->escape($canvas)."'";
+*/
+
+/*
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+*/
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
+$sql.= " GROUP BY i.rowid";
+
+/*
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');
+}
+*/
+
+// Add fields from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldSelect', $parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+
+$sql.= $db->order($sortfield, $sortorder);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+{
+    $result = $db->query($sql);
+    $nbtotalofrecords = $db->num_rows($result);
+    if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+    {
+        $page = 0;
+        $offset = 0;
+    }
+}
+
+$sql.= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+
+if ($resql)
+{
+    $num = $db->num_rows($resql);
+
+    $arrayofselected=is_array($toselect)?$toselect:array();
+
+    $helpurl='EN:Module_IntracommReport|FR:Module_ProDouane';
+    llxHeader('', $title, $helpurl, '');
+
+    // Displays product removal confirmation
+    if (GETPOST('delreport'))	{
+        setEventMessages($langs->trans("IntracommReportDeleted", GETPOST('delreport')), null, 'mesgs');
+    }
+
+    $param='';
+    if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+    if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
+    if ($sall) $param.="&sall=".urlencode($sall);
+    if ($search_ref) $param="&search_ref=".urlencode($search_ref);
+    if ($search_label) $param.="&search_label=".urlencode($search_label);
+
+    // Add $param from extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+    // List of mass actions available
+    $arrayofmassactions =  array(
+        'generate_doc'=>$langs->trans("ReGeneratePDF"),
+        //'builddoc'=>$langs->trans("PDFMerge"),
+        //'presend'=>$langs->trans("SendByMail"),
+    );
+    if ($user->rights->intracommreport->delete) $arrayofmassactions['predelete']="<span class='fa fa-trash paddingrightonly'></span>".$langs->trans("Delete");
+    if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
+    $massactionbutton=$form->selectMassAction('', $arrayofmassactions);
+
+    $newcardbutton='';
+    if ($user->rights->intracommreport->write)
+    {
+        $newcardbutton.= dolGetButtonTitle($langs->trans("NewDeclaration"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/intracommreport/card.php?action=create&amp;type='.$type);
+    }
+
+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
+    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+    print '<input type="hidden" name="token" value="'.newToken().'">';
+    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+    print '<input type="hidden" name="action" value="list">';
+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+    print '<input type="hidden" name="page" value="'.$page.'">';
+    print '<input type="hidden" name="type" value="'.$type.'">';
+    if (empty($arrayfields['i.fk_product_type']['checked'])) print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';
+
+    print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);
+
+    $topicmail="Information";
+    $modelmail="product";
+    $objecttmp=new IntracommReport($db);
+    $trackid='prod'.$object->id;
+    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+    if ($sall)
+    {
+        foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key]=$langs->trans($val);
+        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall).'</div>';
+    }
+
+    $parameters=array();
+    $reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook
+    if (empty($reshook)) $moreforfilter.=$hookmanager->resPrint;
+    else $moreforfilter=$hookmanager->resPrint;
+
+    if ($moreforfilter)
+    {
+        print '<div class="liste_titre liste_titre_bydiv centpercent">';
+        print $moreforfilter;
+        print '</div>';
+    }
+
+    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $selectedfields=$form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);	// This also change content of $arrayfields
+    if ($massactionbutton) $selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+
+    print '<div class="div-table-responsive">';
+    print '<table class="tagtable liste'.($moreforfilter?" listwithfilterbefore":"").'">'."\n";
+
+    // Lines with input filters
+    print '<tr class="liste_titre_filter">';
+    if (! empty($arrayfields['i.ref']['checked']))
+    {
+        print '<td class="liste_titre left">';
+        print '<input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'">';
+        print '</td>';
+    }
+    if (! empty($arrayfields['i.label']['checked']))
+    {
+        print '<td class="liste_titre left">';
+        print '<input class="flat" type="text" name="search_label" size="12" value="'.dol_escape_htmltag($search_label).'">';
+        print '</td>';
+    }
+    // Type
+	// Type (customer/prospect/supplier)
+	if (!empty($arrayfields['customerorsupplier']['checked']))
+	{
+		print '<td class="liste_titre maxwidthonsmartphone center">';
+		if ($type != '') print '<input type="hidden" name="type" value="'.$type.'">';
+		print $formcompany->selectProspectCustomerType($search_type, 'search_type', 'search_type', 'list');
+		print '</select></td>';
+	}
+
+	if (! empty($arrayfields['i.fk_product_type']['checked']))
+    {
+        print '<td class="liste_titre left">';
+        $array=array('-1'=>'&nbsp;', '0'=>$langs->trans('Product'), '1'=>$langs->trans('Service'));
+        print $form->selectarray('search_type', $array, $search_type);
+        print '</td>';
+    }
+
+    /*
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+    */
+    // Fields from hook
+    $parameters=array('arrayfields'=>$arrayfields);
+    $reshook=$hookmanager->executeHooks('printFieldListOption', $parameters);    // Note that $action and $object may have been modified by hook
+    print $hookmanager->resPrint;
+    // Date creation
+    if (! empty($arrayfields['i.datec']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    // Date modification
+    if (! empty($arrayfields['i.tms']['checked']))
+    {
+        print '<td class="liste_titre">';
+        print '</td>';
+    }
+    print '<td class="liste_titre center maxwidthsearch">';
+    $searchpicto=$form->showFilterButtons();
+    print $searchpicto;
+    print '</td>';
+
+    print '</tr>';
+
+    print '<tr class="liste_titre">';
+    if (! empty($arrayfields['i.ref']['checked'])) {
+        print_liste_field_titre($arrayfields['i.ref']['label'], $_SERVER["PHP_SELF"], "i.ref", "", $param, "", $sortfield, $sortorder);
+    }
+    if (! empty($arrayfields['i.label']['checked'])) {
+        print_liste_field_titre($arrayfields['i.label']['label'], $_SERVER["PHP_SELF"], "i.label", "", $param, "", $sortfield, $sortorder);
+    }
+    if (! empty($arrayfields['i.fk_product_type']['checked'])) {
+        print_liste_field_titre($arrayfields['i.fk_product_type']['label'], $_SERVER["PHP_SELF"], "i.fk_product_type", "", $param, "", $sortfield, $sortorder);
+    }
+
+	/*
+    // Extra fields
+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+    */
+    // Hook fields
+    $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;
+    if (! empty($arrayfields['i.datec']['checked'])) {
+        print_liste_field_titre($arrayfields['i.datec']['label'], $_SERVER["PHP_SELF"], "i.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+    }
+    if (! empty($arrayfields['i.tms']['checked'])) {
+        print_liste_field_titre($arrayfields['i.tms']['label'], $_SERVER["PHP_SELF"], "i.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+    }
+
+    print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+    print "</tr>\n";
+
+
+    $intracommreport_static = new IntracommReport($db);
+
+    $i = 0;
+    $totalarray=array();
+    while ($i < min($num, $limit))
+    {
+        $obj = $db->fetch_object($resql);
+
+        $intracommreport_static->id = $obj->rowid;
+        $intracommreport_static->ref = $obj->ref;
+        $intracommreport_static->ref_fourn = $obj->ref_supplier;
+        $intracommreport_static->label = $obj->label;
+        $intracommreport_static->type = $obj->fk_product_type;
+        $intracommreport_static->status_buy = $obj->tobuy;
+        $intracommreport_static->status     = $obj->tosell;
+        $intracommreport_static->status_batch = $obj->tobatch;
+        $intracommreport_static->entity = $obj->entity;
+
+        print '<tr class="oddeven">';
+
+        // Ref
+        if (! empty($arrayfields['i.ref']['checked']))
+        {
+            print '<td class="tdoverflowmax200">';
+            print $intracommreport_static->getNomUrl(1);
+            print "</td>\n";
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Label
+        if (! empty($arrayfields['i.label']['checked']))
+        {
+            print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 80).'</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Type
+        if (! empty($arrayfields['i.fk_product_type']['checked']))
+        {
+            print '<td>'.$obj->fk_product_type.'</td>';
+            if (! $i) $totalarray['nbfield']++;
+        }
+        // Action
+        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 (! $i) $totalarray['nbfield']++;
+
+        print "</tr>\n";
+        $i++;
+    }
+
+    $db->free($resql);
+
+    print "</table>";
+    print "</div>";
+    print '</form>';
+}
+else {
+    dol_print_error($db);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 3d9b36d58b6..24255577b11 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -20,11 +20,12 @@ CantSuggest=Can't suggest
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
 ConfigAccountingExpert=Configuration of the module accounting (double entry)
 Journalization=Journalization
-Journaux=Journals
+Journals=Journals
 JournalFinancial=Financial journals
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=Chart of accounts
-ChartOfSubaccounts=Chart of subaccounts
+ChartOfSubaccounts=Chart of individual accounts
+ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
 CurrentDedicatedAccountingAccount=Current dedicated account
 AssignDedicatedAccountingAccount=New account to assign
 InvoiceLabel=Invoice label
@@ -44,7 +45,9 @@ CountriesInEEC=Countries in EEC
 CountriesNotInEEC=Countries not in EEC
 CountriesInEECExceptMe=Countries in EEC except %s
 CountriesExceptMe=All countries except %s
-AccountantFiles=Export accounting documents
+AccountantFiles=Export source documents
+ExportAccountingSourceDocHelp=With this tool, you can export the source events (list and PDFs) that were used to generate your accountancy. To export your journals, use the menu entry %s - %s.
+VueByAccountAccounting=View by accounting account
 
 MainAccountForCustomersNotDefined=Main accounting account for customers not defined in setup
 MainAccountForSuppliersNotDefined=Main accounting account for vendors not defined in setup
@@ -80,7 +83,7 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup was not complete (accounting code journal not defined for all bank accounts)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
 Selectchartofaccounts=Select active chart of accounts
 ChangeAndLoad=Change and load
 Addanaccount=Add an accounting account
@@ -90,8 +93,8 @@ SubledgerAccount=Subledger account
 SubledgerAccountLabel=Subledger account label
 ShowAccountingAccount=Show accounting account
 ShowAccountingJournal=Show accounting journal
-ShowAccountingAccountInBookKeeping=Show accounting account in ledger
-ShowAccountingAccountInBookKeepingByAccount=Show accounting account in ledger by account
+ShowAccountingAccountInLedger=Show accounting account in ledger
+ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
 MenuDefaultAccounts=Default accounts
 MenuBankAccounts=Bank accounts
@@ -113,7 +116,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in Ledger
+WriteBookKeeping=Register transactions in accounting
 Bookkeeping=Ledger
 AccountBalance=Account balance
 ObjectsRef=Source object ref
@@ -209,12 +212,12 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete Ledger lines
+DeleteMvt=Delete some operation lines from accounting
 DelMonth=Month to delete
 DelYear=Year to delete
 DelJournal=Journal to delete
-ConfirmDeleteMvt=This will delete all lines of the Ledger for the year/month and/or from a specific journal (At least one criterion is required). You will have to reuse the feature 'Registration in accounting' to have the deleted record back in the ledger.
-ConfirmDeleteMvtPartial=This will delete the transaction from the Ledger (all lines related to same transaction will be deleted)
+ConfirmDeleteMvt=This will delete all operation lines of the accounting for the year/month and/or for a specific journal (At least one criterion is required). You will have to reuse the feature '%s' to have the deleted record back in the ledger.
+ConfirmDeleteMvtPartial=This will delete the transaction from the accounting (all operation lines related to the same transaction will be deleted)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Finance journal including all the types of payments by bank account
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8d64fe1a8d6..e47390b9ce0 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -271,7 +271,7 @@ NoticePeriod=Notice period
 NewByMonth=New by month
 Emails=Emails
 EMailsSetup=Emails setup
-EMailsDesc=This page allows you to override your default PHP parameters for email sending. In most cases on Unix/Linux OS, the PHP setup is correct and these parameters are unnecessary.
+EMailsDesc=This page allows you to set parameters or options for email sending.
 EmailSenderProfiles=Emails sender profiles
 EMailsSenderProfileDesc=You can keep this section empty. If you enter some emails here, they will be added to the list of possible senders into the combobox when your write a new email.
 MAIN_MAIL_SMTP_PORT=SMTP/SMTPS Port (default value in php.ini: <b>%s</b>)
@@ -480,9 +480,10 @@ ModuleCompanyCodeSupplierDigitaria=%s followed by the truncated supplier name by
 Use3StepsApproval=By default, Purchase Orders need to be created and approved by 2 different users (one step/user to create and one step/user to approve. Note that if user has both permission to create and approve, one step/user will be enough). You can ask with this option to introduce a third step/user approval, if amount is higher than a dedicated value (so 3 steps will be necessary: 1=validation, 2=first approval and 3=second approval if amount is enough).<br>Set this to empty if one approval (2 steps) is enough, set it to a very low value (0.1) if a second approval (3 steps) is always required.
 UseDoubleApproval=Use a 3 steps approval when amount (without tax) is higher than...
 WarningPHPMail=WARNING: The setup to send emails from the application is using the default generic setup. It is often better to setup outgoing emails to use the email server of your Email Service Provider instead of the default setup for several reasons:
-WarningPHPMailA=- Using the server of the Email Service Provider increase the trustability of your email, so it increase the deliverablity without being flagging as SPAM
+WarningPHPMailA=- Using the server of the Email Service Provider increases the trustability of your email, so it increases the deliverablity without being flagged as SPAM
 WarningPHPMailB=- Some Email Service Providers (like Yahoo) do not allow you to send an email from another server than their own server. Your current setup uses the server of the application to send email and not the server of your email provider, so some recipients (the one compatible with the restrictive DMARC protocol), will ask your email provider if they can accept your email and some email providers (like Yahoo) may respond "no" because the server is not theirs, so few of your sent Emails may not be accepted for delivery (be careful also of your email provider's sending quota).
 WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to send emails is also interesting so all emails sent from application will also be saved into your "Sent" directory of your mailbox.
+WarningPHPMailD=If the method 'PHP Mail' is really the method you would like to use, you can remove this warning by adding the constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP to 1 in Home - Setup - Other.
 WarningPHPMail2=If your email SMTP provider need to restrict email client to some IP addresses (very rare), this is the IP address of the mail user agent (MUA) for your ERP CRM application: <strong>%s</strong>.
 WarningPHPMailSPF=If the domain name in your sender email address is protected by a SPF record (ask you domain name registar), you must add the following IPs in the SPF record of the DNS of your domain: <strong>%s</strong>.
 ClickToShowDescription=Click to show description
@@ -658,7 +659,7 @@ Module50200Desc=Offer customers a PayPal online payment page (PayPal account or
 Module50300Name=Stripe
 Module50300Desc=Offer customers a Stripe online payment page (credit/debit cards). This can be used to allow your customers to make ad-hoc payments or payments related to a specific Dolibarr object (invoice, order etc...)
 Module50400Name=Accounting (double entry)
-Module50400Desc=Accounting management (double entries, support general and auxiliary ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
 Module54000Name=PrintIPP
 Module54000Desc=Direct print (without opening the documents) using Cups IPP interface (Printer must be visible from server, and CUPS must be installed on server).
 Module55000Name=Poll, Survey or Vote
@@ -978,6 +979,9 @@ Permission63003=Delete resources
 Permission63004=Link resources to agenda events
 Permission64001=Allow direct printing
 Permission67000=Allow printing of receipts
+Permission68001=Read intracomm report
+Permission68002=Create/modify intracomm report
+Permission68004=Delete intracomm report
 Permission941601=Read receipts
 Permission941602=Create and modify receipts
 Permission941603=Validate receipts
@@ -1023,6 +1027,8 @@ DictionaryHolidayTypes=Types of leave
 DictionaryOpportunityStatus=Lead status for project/lead
 DictionaryExpenseTaxCat=Expense report - Transportation categories
 DictionaryExpenseTaxRange=Expense report - Range by transportation category
+DictionaryTransportMode=Intracomm report - Transport mode
+TypeOfUnit=Type of unit
 SetupSaved=Setup saved
 SetupNotSaved=Setup not saved
 BackToModuleList=Back to Module list
@@ -1891,7 +1897,7 @@ MailToSendReception=Receptions
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
-MailToProject=Projects page
+MailToProject=Projects
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -2003,7 +2009,7 @@ DisabledResourceLinkContact=Disable feature to link a resource to contacts
 EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
 ConfirmUnactivation=Confirm module reset
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be Prospect or Customer but can't be both)
+DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplify interface for blind person
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Enable this option if you are a blind person, or if you use the application from a text browser like Lynx or Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Change  interface's color for color blind person
@@ -2058,5 +2064,7 @@ MeasuringScaleDesc=The scale is the number of places you have to move the decima
 TemplateAdded=Template added
 TemplateUpdated=Template updated
 TemplateDeleted=Template deleted
-MailToSendEventPush=Template for event reminder emails
+MailToSendEventPush=Event reminder email
 SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+DictionaryProductNature= Nature of product
+CountryIfSpecificToOneCountry=Country (if specific to a given country)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 4ab87aa8420..479155fb2a9 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -166,5 +166,4 @@ TimeType=Duration type
 ReminderType=Callback type
 AddReminder=Create an automatic reminder notification for this event
 ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Notification
-EventReminder=Event Reminder
\ No newline at end of file
+BrowserPush=Browser Notification
\ No newline at end of file
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index 3cfa7ad2538..ffe5ee9ca1c 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -168,6 +168,7 @@ ShowVariousPayment=Show miscellaneous payment
 AddVariousPayment=Add miscellaneous payment
 VariousPaymentId=Miscellaneous payment ID
 VariousPaymentLabel=Miscellaneous payment label
+ConfirmCloneVariousPayment=Confirm the clone of a miscellaneous payment
 SEPAMandate=SEPA mandate
 YourSEPAMandate=Your SEPA mandate
 FindYourSEPAMandate=This is your SEPA mandate to authorize our company to make direct debit order to your bank. Return it signed (scan of the signed document) or send it by mail to
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 923ce91d74a..98dc451b5bb 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -354,6 +354,7 @@ VATIntraManualCheck=You can also check manually on the European Commission websi
 ErrorVATCheckMS_UNAVAILABLE=Check not possible. Check service is not provided by the member state (%s).
 NorProspectNorCustomer=Not prospect, nor customer
 JuridicalStatus=Legal Entity Type
+Workforce=Workforce
 Staff=Employees
 ProspectLevelShort=Potential
 ProspectLevel=Prospect potential
@@ -458,4 +459,5 @@ MulticurrencyUsed=Use Multicurrency
 MulticurrencyCurrency=Currency
 InEEC=Europe (EEC)
 RestOfEurope=Rest of Europe (EEC)
-OutOfEurope=Out of Europe (EEC)
\ No newline at end of file
+OutOfEurope=Out of Europe (EEC)
+CurrentOutstandingBillLate=Current outstanding bill late
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index bb61ed13bbe..9921f21851d 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -47,6 +47,7 @@ CronNbRun=Number of launches
 CronMaxRun=Maximum number of launches
 CronEach=Every
 JobFinished=Job launched and finished
+Scheduled=Scheduled
 #Page card
 CronAdd= Add jobs
 CronEvery=Execute job each
@@ -57,7 +58,7 @@ CronNote=Comment
 CronFieldMandatory=Fields %s is mandatory
 CronErrEndDateStartDt=End date cannot be before start date
 StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Enable
+CronStatusActiveBtn=Schedule
 CronStatusInactiveBtn=Disable
 CronTaskInactive=This job is disabled
 CronId=Id
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index e388c505663..47568f574fa 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -269,6 +269,7 @@ WarningYourLoginWasModifiedPleaseLogin=Your login was modified. For security pur
 WarningAnEntryAlreadyExistForTransKey=An entry already exists for the translation key for this language
 WarningNumberOfRecipientIsRestrictedInMassAction=Warning, number of different recipient is limited to <b>%s</b> when using the mass actions on lists
 WarningDateOfLineMustBeInExpenseReportRange=Warning, the date of line is not in the range of the expense report
+WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
 WarningProjectClosed=Project is closed. You must re-open it first.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Some bank transaction were removed after that the receipt including them were generated. So nb of cheques and total of receipt may differ from number and total in list.
 WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
diff --git a/htdocs/langs/en_US/intracommreport.lang b/htdocs/langs/en_US/intracommreport.lang
new file mode 100644
index 00000000000..73a2a22709d
--- /dev/null
+++ b/htdocs/langs/en_US/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numéro déclaration
+IntracommReportPeriod=Période d'analyse
+IntracommReportTypeDeclaration=Type de déclaration
+IntracommReportDownload=Télécharger fichier XML
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 7e34db3d8b8..a7223605ff0 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -163,9 +163,9 @@ AdvTgtCreateFilter=Create filter
 AdvTgtOrCreateNewFilter=Name of new filter
 NoContactWithCategoryFound=No contact/address with a category found
 NoContactLinkedToThirdpartieWithCategoryFound=No contact/address with a category found
-OutGoingEmailSetup=Outgoing email setup
-InGoingEmailSetup=Incoming email setup
-OutGoingEmailSetupForEmailing=Outgoing email setup (for module %s)
+OutGoingEmailSetup=Outgoing emails
+InGoingEmailSetup=Incoming emails
+OutGoingEmailSetupForEmailing=Outgoing emails (for module %s)
 DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup
 Information=Information
 ContactsWithThirdpartyFilter=Contacts with third-party filter
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 427a5a80d45..1096b9857f1 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -490,6 +490,7 @@ By=By
 From=From
 FromDate=From
 FromLocation=From
+at=at
 to=to
 To=to
 and=and
@@ -1014,6 +1015,8 @@ SearchIntoCustomerShipments=Customer shipments
 SearchIntoExpenseReports=Expense reports
 SearchIntoLeaves=Leave
 SearchIntoTickets=Tickets
+SearchIntoCustomerPayments=Customer payments
+SearchIntoVendorPayments=Vendor payments
 SearchIntoMiscPayments=Miscellaneous payments
 CommentLink=Comments
 NbComments=Number of comments
@@ -1096,3 +1099,4 @@ DateOfBirth=Date of birth
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
 UpToDate=Up-to-date
 OutOfDate=Out-of-date
+EventReminder=Event Reminder
\ No newline at end of file
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 51f547dbdce..3077021aad6 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -339,6 +339,7 @@ UseProductFournDesc=Add a feature to define the descriptions of products defined
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
 PackagingForThisProduct=Packaging
+PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index d6ffb849aa8..996ba20ab7d 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -75,6 +75,7 @@ CreateInternalUserDesc=This form allows you to create an internal user in your c
 InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization.<br>An <b>external</b> user is a customer, vendor or other (Creating an external user for a third-party can be done from the contact record of the third-party).<br><br>In both cases, permissions defines rights on Dolibarr, also external user can have a different menu manager than internal user (See Home - Setup - Display)
 PermissionInheritedFromAGroup=Permission granted because inherited from one of a user's group.
 Inherited=Inherited
+UserWillBe=Created user will be
 UserWillBeInternalUser=Created user will be an internal user (because not linked to a particular third party)
 UserWillBeExternalUser=Created user will be an external user (because linked to a particular third party)
 IdPhoneCaller=Id phone caller
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index 5da6bda8133..37745a85490 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -58,7 +58,7 @@ SuppliersInvoices=Factures fournisseurs
 SupplierBill=Facture fournisseur
 SupplierBills=Factures fournisseurs
 Payment=Règlement
-PaymentBack=Rembourser
+PaymentBack=Remboursement
 CustomerInvoicePaymentBack=Rembourser
 Payments=Règlements
 PaymentsBack=Remboursements
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 1c4116b34c2..5ea03693eb8 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -52,6 +52,8 @@ $object = new Loan($db);
 
 $hookmanager->initHooks(array('loancard', 'globalcard'));
 
+$error = 0;
+
 
 /*
  * Actions
@@ -62,7 +64,7 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 if (empty($reshook))
 {
 	// Classify paid
-	if ($action == 'confirm_paid' && $confirm == 'yes')
+	if ($action == 'confirm_paid' && $confirm == 'yes' && $user->rights->loan->write)
 	{
 		$object->fetch($id);
 		$result = $object->set_paid($user);
@@ -75,7 +77,7 @@ if (empty($reshook))
 	}
 
 	// Delete loan
-	if ($action == 'confirm_delete' && $confirm == 'yes')
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->write)
 	{
 		$object->fetch($id);
 		$result = $object->delete($user);
@@ -146,12 +148,12 @@ if (empty($reshook))
 				if ($id <= 0)
 				{
 					$error++;
-					setEventMessages($object->db->lastqueryerror, $object->errors, 'errors');
+					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'create';
 				}
 			}
 		} else {
-			header("Location: index.php");
+			header("Location: list.php");
 			exit();
 		}
 	}
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 9c5c1b559ad..dc6d72094b2 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -417,6 +417,31 @@ class PaymentLoan extends CommonObject
 		}
 	}
 
+	/**
+	 * Retourne le libelle du statut d'une facture (brouillon, validee, abandonnee, payee)
+	 *
+	 * @param	int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return  string				Libelle
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->statut, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Renvoi le libelle d'un statut donne
+	 *
+	 * @param   int		$status     Statut
+	 * @param   int		$mode       0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+	 * @return	string  		    Libelle du statut
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		return '';
+	}
+
 	/**
 	 *      Add record into bank for payment with links between this bank record and invoices of payment.
 	 *      All payment properties must have been set first like after a call to create().
diff --git a/htdocs/loan/payment/card.php b/htdocs/loan/payment/card.php
index 51aa3f85a92..15759a8ce7b 100644
--- a/htdocs/loan/payment/card.php
+++ b/htdocs/loan/payment/card.php
@@ -71,42 +71,6 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->loan->del
 	}
 }
 
-// Create payment
-if ($action == 'confirm_valide' && $confirm == 'yes' && $user->rights->loan->write)
-{
-	$db->begin();
-
-	$result = $payment->valide();
-
-	if ($result > 0)
-	{
-		$db->commit();
-
-		$factures = array(); // TODO Get all id of invoices linked to this payment
-		foreach ($factures as $id)
-		{
-			$fac = new Facture($db);
-			$fac->fetch($id);
-
-			$outputlangs = $langs;
-			if (!empty($_REQUEST['lang_id']))
-			{
-				$outputlangs = new Translate("", $conf);
-				$outputlangs->setDefaultLang($_REQUEST['lang_id']);
-			}
-			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-				$fac->generateDocument($fac->model_pdf, $outputlangs);
-			}
-		}
-
-		header('Location: card.php?id='.$payment->id);
-		exit;
-	} else {
-		setEventMessages($payment->error, $payment->errors, 'errors');
-		$db->rollback();
-	}
-}
-
 
 /*
  * View
@@ -124,7 +88,7 @@ $head[$h][1] = $langs->trans("PaymentLoan");
 $hselected = $h;
 $h++;
 
-dol_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), 0, 'payment');
+dol_fiche_head($head, $hselected, $langs->trans("PaymentLoan"), -1, 'payment');
 
 /*
  * Confirm deletion of the payment
@@ -134,24 +98,17 @@ if ($action == 'delete')
 	print $form->formconfirm('card.php?id='.$payment->id, $langs->trans("DeletePayment"), $langs->trans("ConfirmDeletePayment"), 'confirm_delete', '', 0, 2);
 }
 
-/*
- * Confirm validation of the payment
- */
-if ($action == 'valide')
-{
-	$facid = $_GET['facid'];
-	print $form->formconfirm('card.php?id='.$payment->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide', '', 0, 2);
-}
+$linkback = '';
+$morehtmlref = '';
+$morehtmlright = '';
 
+dol_banner_tab($payment, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
+
+print '<div class="fichecenter">';
+print '<div class="underbanner clearboth"></div>';
 
 print '<table class="border centpercent">';
 
-// Ref
-print '<tr><td class="titlefield">'.$langs->trans('Ref').'</td>';
-print '<td>';
-print $form->showrefnav($payment, 'id', '', 1, 'rowid', 'id');
-print '</td></tr>';
-
 // Date
 print '<tr><td>'.$langs->trans('Date').'</td><td>'.dol_print_date($payment->datep, 'day').'</td></tr>';
 
@@ -188,6 +145,8 @@ if (!empty($conf->banque->enabled))
 
 print '</table>';
 
+print '</div>';
+
 
 /*
  * List of loans payed
@@ -262,20 +221,8 @@ print '</div>';
 /*
  * Actions buttons
  */
-print '<div class="tabsAction">';
 
-/*
-if (! empty($conf->global->BILL_ADD_PAYMENT_VALIDATION))
-{
-	if ($user->socid == 0 && $payment->statut == 0 && $_GET['action'] == '')
-	{
-		if ($user->rights->facture->paiement)
-		{
-			print '<a class="butAction" href="card.php?id='.$_GET['id'].'&amp;facid='.$objp->facid.'&amp;action=valide">'.$langs->trans('Valid').'</a>';
-		}
-	}
-}
-*/
+print '<div class="tabsAction">';
 
 if (empty($action) && !empty($user->rights->loan->delete))
 {
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 9aaa75b9845..82f114b7b20 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -272,14 +272,13 @@ if ($action == 'create')
 	print '<input type="hidden" name="id" value="'.$chid.'">';
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
 	print '<input type="hidden" name="line_id" value="'.$line_id.'">';
-	print '<input type="hidden" name="remaindertopay" value="'.($total-$sumpaid).'">';
+	print '<input type="hidden" name="remaindertopay" value="'.($total - $sumpaid).'">';
 	print '<input type="hidden" name="action" value="add_payment">';
 
-    dol_fiche_head();
+	dol_fiche_head();
 
-	print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
-
-	print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Loan").'</td>';
+	/*
+	 print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td colspan="2"><a href="'.DOL_URL_ROOT.'/loan/card.php?id='.$chid.'">'.$chid.'</a></td></tr>';
     if ($echance > 0)
@@ -295,13 +294,9 @@ if ($action == 'create')
 	print '</tr>';
 
 	print '</table>';
+	*/
 
-	print '<br>';
-
-	print '<table cellspacing="0" class="border" width="100%" cellpadding="2">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="3">'.$langs->trans("Payment").'</td>';
-	print '</tr>';
+	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Date").'</td><td colspan="2">';
     if (empty($datepaid))
@@ -310,7 +305,6 @@ if ($action == 'create')
     else $datepayment = $datepaid;
 	print $form->selectDate($datepayment, '', '', '', '', "add_payment", 1, 1);
 	print "</td>";
-
 	print '</tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td colspan="2">';
@@ -321,14 +315,15 @@ if ($action == 'create')
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td colspan="2">';
-	$form->select_comptes(isset($_POST["accountid"])?$_POST["accountid"]:$loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1);  // Show opend bank account list
+	$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", 'int') : $loan->accountid, "accountid", 0, 'courant = '.Account::TYPE_CURRENT, 1);  // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
 	print '<tr><td>'.$langs->trans('Numero');
 	print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 	print '</td>';
-	print '<td colspan="2"><input name="num_payment" type="text" value="'.GETPOST('num_payment', 'alphanohtml').'"></td></tr>'."\n";
+	print '<td colspan="2"><input name="num_payment" type="text" value="'.GETPOST('num_payment', 'alphanohtml').'"></td>'."\n";
+	print "</tr>";
 
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans("NotePrivate").'</td>';
@@ -344,6 +339,7 @@ if ($action == 'create')
 
 	dol_fiche_end();
 
+
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td class="left">'.$langs->trans("DateDue").'</td>';
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ef7b5e33a7d..3cfb5c3d1a5 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2020       Demarest Maxime         <maxime@indelog.fr>
+ * Copyright (C) 2020       Charlene Benke         <charlie@patas-monkey.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,12 +58,16 @@ if (!empty($_SERVER['MAIN_SHOW_TUNING_INFO']))
  */
 function testSqlAndScriptInject($val, $type)
 {
-	$val = html_entity_decode($val, ENT_QUOTES);	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'
+	// Decode string first
+	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'
+	// So "&colon;&apos;" become ":'" (due to ENT_HTML5)
+	$val = html_entity_decode($val, ENT_QUOTES|ENT_HTML5);
+
 	// TODO loop to decode until no more thing to decode ?
 
 	// We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)
-	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val);	// We should use dol_string_nounprintableascii but function is not yet loaded/available
-	//var_dump($val);
+	// We should use dol_string_nounprintableascii but function is not yet loaded/available
+	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val);	// /u operator makes UTF8 valid characters being ignored so are not included into the replace
 
 	$inj = 0;
 	// For SQL Injection (only GET are used to be included into bad escaped SQL requests)
@@ -221,25 +226,25 @@ if (!empty($_POST["DOL_AUTOSET_COOKIE"]))
 }
 
 
-// Init session. Name of session is specific to Dolibarr instance.
-// Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
-$prefix = dol_getprefix('');
+// Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
+require_once 'master.inc.php';
 
+// Init session. Name of session is specific to Dolibarr instance.
+// Must be done after the include of master.inc.php so $conf file is loaded and vars like $dolibarr_main_force_https are set.
+// Note: the function dol_getprefix may have been redefined to return a different key to manage another area to protect.
+$prefix = dol_getprefix('');		// This uses the $conf file
 $sessionname = 'DOLSESSID_'.$prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 if (!empty($_COOKIE[$sessiontimeout])) ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
 session_name($sessionname);
-// This create lock, released when session_write_close() or end of page.
+// This create lock, released by session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
 if (!defined('NOSESSION'))
 {
 	session_start();
 }
 
-// Init the 5 global objects, this include will make the 'new Xxx()' and set properties for: $conf, $db, $langs, $user, $mysoc
-require_once 'master.inc.php';
-
 // Activate end of page function
 register_shutdown_function('dol_shutdown');
 
@@ -375,10 +380,10 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && !empty($conf->gl
 	// Check all cases that need a token (all POST actions, all actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set, all sensitive GET actions)
 	if ($_SERVER['REQUEST_METHOD'] == 'POST' ||
 		((GETPOSTISSET('action') || GETPOSTISSET('massaction')) && defined('CSRFCHECK_WITH_TOKEN')) ||
-		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deleteprof', 'deletepayment')))
+		in_array(GETPOST('action', 'aZ09'), array('add', 'addtimespent', 'update', 'install', 'delete', 'deleteprof', 'deletepayment', 'confirm_create_user', 'confirm_create_thirdparty', 'confirm_reject_check')))
 	{
 		if (!GETPOSTISSET('token')) {
-			if (GETPOST('uploadform')) {
+			if (GETPOST('uploadform', 'int')) {
 				dol_syslog("--- Access to ".$_SERVER["PHP_SELF"]." refused. File size too large.");
 				$langs->loadLangs(array("errors", "install"));
 				print $langs->trans("ErrorFileSizeTooLarge").' ';
@@ -1655,8 +1660,13 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 			$helpbaseurl = '';
 			$helppage = '';
 			$mode = '';
+			$helppresent = '';
 
-			if (empty($helppagename)) $helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			if (empty($helppagename)) {
+				$helppagename = 'EN:User_documentation|FR:Documentation_utilisateur|ES:Documentación_usuarios';
+			} else {
+				$helppresent = 'helppresent';
+			}
 
 			// Get helpbaseurl, helppage and mode from helppagename and langs
 			$arrayres = getHelpParamFor($helppagename, $langs);
@@ -1674,7 +1684,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 				if ($mode == 'wiki') $text .= sprintf($helpbaseurl, urlencode(html_entity_decode($helppage)));
 				else $text .= sprintf($helpbaseurl, $helppage);
 				$text .= '">';
-				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle"></span>';
+				$text .= '<span class="fa fa-question-circle atoplogin valignmiddle'.($helppresent ? ' '.$helppresent : '').'"></span>';
 				$text .= '</a>';
 				$toprightmenu .= @Form::textwithtooltip('', $title, 2, 1, $text, 'login_block_elem', 2);
 			}
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index 18ca9b5ea20..2c03c3dd2a9 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -568,7 +568,7 @@ class MyObject extends CommonObject
 			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " SET ref = '".$this->db->escape($num)."',";
 			$sql .= " status = ".self::STATUS_VALIDATED;
-			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."',";
+			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."'";
 			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".$user->id;
 			$sql .= " WHERE rowid = ".$this->id;
 
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 694263e2ec5..ea9eeed797d 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
@@ -43,82 +43,82 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
  */
 class pdf_standard_myobject extends ModelePDFMyObject
 {
-    /**
-     * @var DoliDb Database handler
-     */
-    public $db;
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
 
 	/**
-     * @var string model name
-     */
-    public $name;
+	 * @var string model name
+	 */
+	public $name;
 
 	/**
-     * @var string model description (short text)
-     */
-    public $description;
-
-    /**
-     * @var int     Save the name of generated file as the main doc when generating a doc with this template
-     */
-    public $update_main_doc_field;
+	 * @var string model description (short text)
+	 */
+	public $description;
 
 	/**
-     * @var string document type
-     */
-    public $type;
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
 
 	/**
-     * @var array Minimum version of PHP required by module.
-     * e.g.: PHP ≥ 5.6 = array(5, 6)
-     */
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
 	public $phpmin = array(5, 6);
 
 	/**
-     * Dolibarr version of the loaded document
-     * @var string
-     */
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
 	public $version = 'dolibarr';
 
-     /**
-     * @var int page_largeur
-     */
-    public $page_largeur;
+	 /**
+	  * @var int page_largeur
+	  */
+	public $page_largeur;
 
 	/**
-     * @var int page_hauteur
-     */
-    public $page_hauteur;
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
 
 	/**
-     * @var array format
-     */
-    public $format;
+	 * @var array format
+	 */
+	public $format;
 
 	/**
-     * @var int marge_gauche
-     */
+	 * @var int marge_gauche
+	 */
 	public $marge_gauche;
 
 	/**
-     * @var int marge_droite
-     */
+	 * @var int marge_droite
+	 */
 	public $marge_droite;
 
 	/**
-     * @var int marge_haute
-     */
+	 * @var int marge_haute
+	 */
 	public $marge_haute;
 
 	/**
-     * @var int marge_basse
-     */
+	 * @var int marge_basse
+	 */
 	public $marge_basse;
 
-    /**
-	* Issuer
-	* @var Societe Object that emits
-	*/
+	/**
+	 * Issuer
+	 * @var Societe Object that emits
+	 */
 	public $emetteur;
 
 	/**
@@ -182,50 +182,50 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	}
 
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-    /**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int         	    			1=OK, 0=KO
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
 	 */
 	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-	    // phpcs:enable
-	    global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
-	    dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
+		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
-	    if (!is_object($outputlangs)) $outputlangs = $langs;
-	    // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-	    if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
-	    // Load translation files required by the page
-	    $outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
 
-	    if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
-	    	global $outputlangsbis;
-	    	$outputlangsbis = new Translate('', $conf);
-	    	$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
-	    	$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
-	    }
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			global $outputlangsbis;
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		}
 
-	    $nblines = (is_array($object->lines) ? count($object->lines) : 0);
+		$nblines = (is_array($object->lines) ? count($object->lines) : 0);
 
-	    $hidetop = 0;
-	    if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
-	        $hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
-	    }
+		$hidetop = 0;
+		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+		}
 
-	    // Loop on each lines to detect if there is at least one image to show
-	    $realpatharray = array();
-	    $this->atleastonephoto = false;
-	    /*
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		$this->atleastonephoto = false;
+		/*
 	    if (!empty($conf->global->MAIN_GENERATE_MYOBJECT_WITH_PICTURE))
 	    {
 	        $objphoto = new Product($this->db);
@@ -278,528 +278,528 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	    }
 		*/
 
-	    //if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
 
-	    if ($conf->mymodule->dir_output.'/myobject')
-	    {
-	        $object->fetch_thirdparty();
+		if ($conf->mymodule->dir_output.'/myobject')
+		{
+			$object->fetch_thirdparty();
 
-	        // Definition of $dir and $file
-	        if ($object->specimen)
-	        {
-	        	$dir = $conf->mymodule->dir_output.'/myobject';
-	            $file = $dir."/SPECIMEN.pdf";
-	        } else {
-	            $objectref = dol_sanitizeFileName($object->ref);
-	            $dir = $conf->mymodule->dir_output.'/myobject/'.$objectref;
-	            $file = $dir."/".$objectref.".pdf";
-	        }
-	        if (!file_exists($dir))
-	        {
-	            if (dol_mkdir($dir) < 0)
-	            {
-	                $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
-	                return 0;
-	            }
-	        }
+			// Definition of $dir and $file
+			if ($object->specimen)
+			{
+				$dir = $conf->mymodule->dir_output.'/myobject';
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->mymodule->dir_output.'/myobject/'.$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
+			if (!file_exists($dir))
+			{
+				if (dol_mkdir($dir) < 0)
+				{
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
 
-	        if (file_exists($dir))
-	        {
-	            // Add pdfgeneration hook
-	            if (!is_object($hookmanager))
-	            {
-	                include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-	                $hookmanager = new HookManager($this->db);
-	            }
-	            $hookmanager->initHooks(array('pdfgeneration'));
-	            $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
-	            global $action;
-	            $reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+			if (file_exists($dir))
+			{
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager))
+				{
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-	            // Set nblines with the new facture lines content after hook
-	            $nblines = (is_array($object->lines) ? count($object->lines) : 0);
+				// Set nblines with the new facture lines content after hook
+				$nblines = (is_array($object->lines) ? count($object->lines) : 0);
 
-	            // Create pdf instance
-	            $pdf = pdf_getInstance($this->format);
-	            $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
-	            $pdf->SetAutoPageBreak(1, 0);
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
 
-	            $heightforinfotot = 50; // Height reserved to output the info and total part and payment part
-	            $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$heightforinfotot = 50; // Height reserved to output the info and total part and payment part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
 
-	            if (class_exists('TCPDF'))
-	            {
-	                $pdf->setPrintHeader(false);
-	                $pdf->setPrintFooter(false);
-	            }
-	            $pdf->SetFont(pdf_getPDFFont($outputlangs));
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-	            // Set path to the background PDF File
-                if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-	            {
-	            	$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-	                $tplidx = $pdf->importPage(1);
-	            }
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
-	            $pdf->Open();
-	            $pagenb = 0;
-	            $pdf->SetDrawColor(128, 128, 128);
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
-	            $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-	            $pdf->SetSubject($outputlangs->transnoentities("PdfTitle"));
-	            $pdf->SetCreator("Dolibarr ".DOL_VERSION);
-	            $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-	            $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-	            if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("PdfTitle"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-	            // Set certificate
-	            $cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
-	            // If user has no certificate, we try to take the company one
-	            if (!$cert) {
-	            	$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
-	            }
-	            // If a certificate is found
-	            if ($cert) {
-	            	$info = array(
-	            		'Name' => $this->emetteur->name,
-	            		'Location' => getCountry($this->emetteur->country_code, 0),
-	            		'Reason' => 'MYOBJECT',
-	            		'ContactInfo' => $this->emetteur->email
-	            	);
-	            	$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
-	            }
+				// Set certificate
+				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+				// If user has no certificate, we try to take the company one
+				if (!$cert) {
+					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
+				}
+				// If a certificate is found
+				if ($cert) {
+					$info = array(
+						'Name' => $this->emetteur->name,
+						'Location' => getCountry($this->emetteur->country_code, 0),
+						'Reason' => 'MYOBJECT',
+						'ContactInfo' => $this->emetteur->email
+					);
+					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
+				}
 
-	            $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
-	            // New page
-	            $pdf->AddPage();
-	            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	            $pagenb++;
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
 
-	            $top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
-	            $pdf->SetFont('', '', $default_font_size - 1);
-	            $pdf->MultiCell(0, 3, ''); // Set interline to 3
-	            $pdf->SetTextColor(0, 0, 0);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
-	            $tab_top = 90 + $top_shift;
-	            $tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
-	            $tab_height = 130 - $top_shift;
-	            $tab_height_newpage = 150;
-	            if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
+				$tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+				$tab_height = 130 - $top_shift;
+				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $tab_height_newpage -= $top_shift;
 
-                $nexY = $tab_top - 1;
+				$nexY = $tab_top - 1;
 
-	            // Display notes
-	            $notetoshow = empty($object->note_public) ? '' : $object->note_public;
-	            // Extrafields in note
-                $extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
-                if (!empty($extranote))
-                {
-                    $notetoshow = dol_concatdesc($notetoshow, $extranote);
-                }
+				// Display notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote))
+				{
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
 
-	            $pagenb = $pdf->getPage();
-	            if ($notetoshow)
-	            {
+				$pagenb = $pdf->getPage();
+				if ($notetoshow)
+				{
 					$tab_top -= 2;
 
-	                $tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
-	                $pageposbeforenote = $pagenb;
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
 
-	                $substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
-	                complete_substitutions_array($substitutionarray, $outputlangs, $object);
-	                $notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
-	                $notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
 
-	                $pdf->startTransaction();
+					$pdf->startTransaction();
 
-	                $pdf->SetFont('', '', $default_font_size - 1);
-	                $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-	                // Description
-	                $pageposafternote = $pdf->getPage();
-	                $posyafter = $pdf->GetY();
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					// Description
+					$pageposafternote = $pdf->getPage();
+					$posyafter = $pdf->GetY();
 
-	                if ($pageposafternote > $pageposbeforenote)
-	                {
-	                    $pdf->rollbackTransaction(true);
+					if ($pageposafternote > $pageposbeforenote)
+					{
+						$pdf->rollbackTransaction(true);
 
-	                    // prepare pages to receive notes
-	                    while ($pagenb < $pageposafternote) {
-	                        $pdf->AddPage();
-	                        $pagenb++;
-	                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-	                        // $this->_pagefoot($pdf,$object,$outputlangs,1);
-	                        $pdf->setTopMargin($tab_top_newpage);
-	                        // The only function to edit the bottom margin of current page to set it.
-	                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                    }
+						// prepare pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
 
-	                    // back to start
-	                    $pdf->setPage($pageposbeforenote);
-	                    $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                    $pdf->SetFont('', '', $default_font_size - 1);
-	                    $pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
-	                    $pageposafternote = $pdf->getPage();
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
 
-	                    $posyafter = $pdf->GetY();
+						$posyafter = $pdf->GetY();
 
-	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
-	                    {
-	                        $pdf->AddPage('', '', true);
-	                        $pagenb++;
-	                        $pageposafternote++;
-	                        $pdf->setPage($pageposafternote);
-	                        $pdf->setTopMargin($tab_top_newpage);
-	                        // The only function to edit the bottom margin of current page to set it.
-	                        $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-	                        //$posyafter = $tab_top_newpage;
-	                    }
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))	// There is no space left for total+free text
+						{
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							//$posyafter = $tab_top_newpage;
+						}
 
 
-	                    // apply note frame to previous pages
-	                    $i = $pageposbeforenote;
-	                    while ($i < $pageposafternote) {
-	                        $pdf->setPage($i);
+						// apply note frame to previous pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
 
 
-	                        $pdf->SetDrawColor(128, 128, 128);
-	                        // Draw note frame
-	                        if ($i > $pageposbeforenote) {
-	                            $height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-	                            $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                        } else {
-	                            $height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-	                            $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
-	                        }
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
 
-	                        // Add footer
-	                        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-	                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
 
-	                        $i++;
-	                    }
+							$i++;
+						}
 
-	                    // apply note frame to last page
-	                    $pdf->setPage($pageposafternote);
-	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                    if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-	                    $height_note = $posyafter - $tab_top_newpage;
-	                    $pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
-	                } else // No pagebreak
-	                {
-	                    $pdf->commitTransaction();
-	                    $posyafter = $pdf->GetY();
-	                    $height_note = $posyafter - $tab_top;
-	                    $pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
 
 
-	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
-	                    {
-	                        // not enough space, need to add page
-	                        $pdf->AddPage('', '', true);
-	                        $pagenb++;
-	                        $pageposafternote++;
-	                        $pdf->setPage($pageposafternote);
-	                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-	                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20)))
+						{
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
 
-	                        $posyafter = $tab_top_newpage;
-	                    }
-	                }
+							$posyafter = $tab_top_newpage;
+						}
+					}
 
-	                $tab_height = $tab_height - $height_note;
-	                $tab_top = $posyafter + 6;
-	            } else {
-	                $height_note = 0;
-	            }
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
+				} else {
+					$height_note = 0;
+				}
 
-	            // Use new auto column system
-	            $this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				// Use new auto column system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
-	            // Table simulation to know the height of the title line
-			    $pdf->startTransaction();
-			    $this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
-			    $pdf->rollbackTransaction(true);
+				// Table simulation to know the height of the title line
+				$pdf->startTransaction();
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$pdf->rollbackTransaction(true);
 
-			    $nexY = $tab_top + $this->tabTitleHeight;
+				$nexY = $tab_top + $this->tabTitleHeight;
 
-	            // Loop on each lines
-	            $pageposbeforeprintlines = $pdf->getPage();
-	            $pagenb = $pageposbeforeprintlines;
-	            for ($i = 0; $i < $nblines; $i++)
-	            {
-	                $curY = $nexY;
-	                $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
-	                $pdf->SetTextColor(0, 0, 0);
+				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+				for ($i = 0; $i < $nblines; $i++)
+				{
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
 
-	                // Define size of image if we need it
-	                $imglinesize = array();
-	                if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					// Define size of image if we need it
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
 
-	                $pdf->setTopMargin($tab_top_newpage);
-	                $pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
-	                $pageposbefore = $pdf->getPage();
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
 
-	                $showpricebeforepagebreak = 1;
-	                $posYAfterImage = 0;
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
 
-	                if ($this->getColumnStatus('photo'))
-	                {
-    	                // We start with Photo of product line
-    	                if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
-    	                {
-    	                    $pdf->AddPage('', '', true);
-    	                    if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                    $pdf->setPage($pageposbefore + 1);
+					if ($this->getColumnStatus('photo'))
+					{
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// If photo too high, we moved completely on new page
+						{
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->setPage($pageposbefore + 1);
 
-    	                    $curY = $tab_top_newpage;
+							$curY = $tab_top_newpage;
 
 							// Allows data in the first page if description is long enough to break in multiples pages
 							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 								$showpricebeforepagebreak = 1;
 							else $showpricebeforepagebreak = 0;
-    	                }
+						}
 
-    	                if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
-    	                {
-    	                    $pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
-    	                    // $pdf->Image does not increase value return by getY, so we save it manually
-    	                    $posYAfterImage = $curY + $imglinesize['height'];
-    	                }
-	                }
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height']))
+						{
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
+					}
 
-	                // Description of product line
-	                if ($this->getColumnStatus('desc'))
-	                {
-    	                $pdf->startTransaction();
+					// Description of product line
+					if ($this->getColumnStatus('desc'))
+					{
+						$pdf->startTransaction();
 
-                        $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
-    	                $pageposafter = $pdf->getPage();
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$pageposafter = $pdf->getPage();
 
-    	                if ($pageposafter > $pageposbefore)	// There is a pagebreak
-    	                {
-    	                    $pdf->rollbackTransaction(true);
-    	                    $pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						if ($pageposafter > $pageposbefore)	// There is a pagebreak
+						{
+							$pdf->rollbackTransaction(true);
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
-                            $this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
-    	                    $pageposafter = $pdf->getPage();
-    	                    $posyafter = $pdf->GetY();
-    	                    //var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-    	                    if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
-    	                    {
-    	                        if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
-    	                        {
-    	                            $pdf->AddPage('', '', true);
-    	                            if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-    	                            $pdf->setPage($pageposafter + 1);
-    	                        }
-    	                    } else {
-    	                        // We found a page break
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot)))	// There is no space left for total+free text
+							{
+								if ($i == ($nblines - 1))	// No more lines, and no space left to show total, so we create a new page
+								{
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
 								// Allows data in the first page if description is long enough to break in multiples pages
 								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
 									$showpricebeforepagebreak = 1;
 								else $showpricebeforepagebreak = 0;
-    	                    }
-    	                } else // No pagebreak
-    	                {
-    	                    $pdf->commitTransaction();
-    	                }
-	                }
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+					}
 
-                    $nexY = $pdf->GetY();
-	                $pageposafter = $pdf->getPage();
-	                $pdf->setPage($pageposbefore);
-	                $pdf->setTopMargin($this->marge_haute);
-	                $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
-	                // We suppose that a too long description or photo were moved completely on next page
-	                if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
-	                    $pdf->setPage($pageposafter); $curY = $tab_top_newpage;
-	                }
+					// We suppose that a too long description or photo were moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
 
-	                $pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
 
-	                // Quantity
-	                // Enough for 6 chars
-	                if ($this->getColumnStatus('qty'))
-	                {
-	                    $qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
-	                    $this->printStdColumnContent($pdf, $curY, 'qty', $qty);
-	                    $nexY = max($pdf->GetY(), $nexY);
-	                }
+					// Quantity
+					// Enough for 6 chars
+					if ($this->getColumnStatus('qty'))
+					{
+						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
 
-                    // Extrafields
-	                if (!empty($object->lines[$i]->array_options)) {
-	                    foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
-                            if ($this->getColumnStatus($extrafieldColKey))
-                            {
-                                $extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
-                                $this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
-                                $nexY = max($pdf->GetY(), $nexY);
-                            }
-                        }
-                    }
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey))
+							{
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
 
 
-	                $parameters = array(
-	                    'object' => $object,
-	                    'i' => $i,
-	                    'pdf' =>& $pdf,
-	                    'curY' =>& $curY,
-	                    'nexY' =>& $nexY,
-	                    'outputlangs' => $outputlangs,
-	                    'hidedetails' => $hidedetails
-	                );
-	                $reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
+					$parameters = array(
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
+					);
+					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
 
 
-	                $sign = 1;
-	                // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
-	                $prev_progress = $object->lines[$i]->get_prev_progress($object->id);
-	                if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
-	                {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
-	                } else {
-	                    if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
-	                    else $tvaligne = $sign * $object->lines[$i]->total_tva;
-	                }
+					$sign = 1;
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) // Compute progress from previous situation
+					{
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						else $tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+					} else {
+						if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						else $tvaligne = $sign * $object->lines[$i]->total_tva;
+					}
 
-	                $localtax1ligne = $object->lines[$i]->total_localtax1;
-	                $localtax2ligne = $object->lines[$i]->total_localtax2;
-	                $localtax1_rate = $object->lines[$i]->localtax1_tx;
-	                $localtax2_rate = $object->lines[$i]->localtax2_tx;
-	                $localtax1_type = $object->lines[$i]->localtax1_type;
-	                $localtax2_type = $object->lines[$i]->localtax2_type;
+					$localtax1ligne = $object->lines[$i]->total_localtax1;
+					$localtax2ligne = $object->lines[$i]->total_localtax2;
+					$localtax1_rate = $object->lines[$i]->localtax1_tx;
+					$localtax2_rate = $object->lines[$i]->localtax2_tx;
+					$localtax1_type = $object->lines[$i]->localtax1_type;
+					$localtax2_type = $object->lines[$i]->localtax2_type;
 
-	                if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
-	                if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
-	                if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
 
-	                $vatrate = (string) $object->lines[$i]->tva_tx;
+					$vatrate = (string) $object->lines[$i]->tva_tx;
 
-	                // Retrieve type from database for backward compatibility with old records
-	                if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
-	                    && (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
-	                {
-	                    $localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-	                    $localtax1_type = $localtaxtmp_array[0];
-	                    $localtax2_type = $localtaxtmp_array[2];
-	                }
+					// Retrieve type from database for backward compatibility with old records
+					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
+						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) // and there is local tax
+					{
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+						$localtax1_type = $localtaxtmp_array[0];
+						$localtax2_type = $localtaxtmp_array[2];
+					}
 
-	                // retrieve global local tax
-                    if ($localtax1_type && $localtax1ligne != 0) {
-                        $this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
-                    }
-                    if ($localtax2_type && $localtax2ligne != 0) {
-                        $this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
-                    }
+					// retrieve global local tax
+					if ($localtax1_type && $localtax1ligne != 0) {
+						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
+						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
 
-                    if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
-                    if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
-                    $this->tva[$vatrate] += $tvaligne;
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
+					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					$this->tva[$vatrate] += $tvaligne;
 
-                    $nexY = max($nexY, $posYAfterImage);
+					$nexY = max($nexY, $posYAfterImage);
 
-                    // Add line
-                    if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
-                        $pdf->setPage($pageposafter);
-                        $pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
-                        //$pdf->SetDrawColor(190,190,200);
-                        $pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
-                        $pdf->SetLineStyle(array('dash'=>0));
-                    }
+					// Add line
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
 
-                    // Detect if some page were added automatically and output _tableau for past pages
-                    while ($pagenb < $pageposafter) {
-                        $pdf->setPage($pagenb);
-                        if ($pagenb == $pageposbeforeprintlines) {
-                            $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        } else {
-                        	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
-                        $pagenb++;
-                        $pdf->setPage($pagenb);
-                        $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
-                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    }
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						if ($pagenb == $pageposbeforeprintlines) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
 
-                    if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
-                        if ($pagenb == $pageposafter) {
-                        	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
-                        } else {
-                        	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
-                        }
-                        $this->_pagefoot($pdf, $object, $outputlangs, 1);
-                        // New page
-                        $pdf->AddPage();
-                        if (!empty($tplidx)) $pdf->useTemplate($tplidx);
-                        $pagenb++;
-                        if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
-                    }
-	            }
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
 
-	            // Show square
-	            if ($pagenb == $pageposbeforeprintlines)
-	            {
-	            	$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
-	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            } else {
-	            	$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
-	                $bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-	            }
+				// Show square
+				if ($pagenb == $pageposbeforeprintlines)
+				{
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
 
-	            // Display infos area
-	            //$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+				// Display infos area
+				//$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
 
-	            // Display total zone
-	            //$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+				// Display total zone
+				//$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
 
-	            // Display payment area
-	            /*
+				// Display payment area
+				/*
 	            if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
 	            {
 	                $posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
 	            }
 	            */
 
-	            // Pagefoot
-	            $this->_pagefoot($pdf, $object, $outputlangs);
-	            if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+				// Pagefoot
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
-	            $pdf->Close();
+				$pdf->Close();
 
-	            $pdf->Output($file, 'F');
+				$pdf->Output($file, 'F');
 
-	            // Add pdfgeneration hook
-	            $hookmanager->initHooks(array('pdfgeneration'));
-	            $parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
-	            global $action;
-	            $reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	            if ($reshook < 0)
-	            {
-	                $this->error = $hookmanager->error;
-	                $this->errors = $hookmanager->errors;
-	            }
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0)
+				{
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
 
-	            if (!empty($conf->global->MAIN_UMASK))
-	                @chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
-	                $this->result = array('fullpath'=>$file);
+					$this->result = array('fullpath'=>$file);
 
-	                return 1; // No error
-	        } else {
-	            $this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
-	            return 0;
-	        }
-	    } else {
-	        $this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
-	        return 0;
-	    }
+					return 1; // No error
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
+			return 0;
+		}
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -872,7 +872,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
 
 		if (empty($hidetop)) {
-		    $pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
 		}
 	}
 
@@ -900,9 +900,9 @@ class pdf_standard_myobject extends ModelePDFMyObject
 
 		// Show Draft Watermark
 		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK)))
-        {
-		      pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
-        }
+		{
+			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+		}
 
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -910,7 +910,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		$w = 110;
 
 		$posy = $this->marge_haute;
-        $posx = $this->page_largeur - $this->marge_droite - $w;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
 
 		$pdf->SetXY($this->marge_gauche, $posy);
 
@@ -929,7 +929,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 				}
 				if (is_readable($logo))
 				{
-				    $height = pdf_getHeightForLogo($logo);
+					$height = pdf_getHeightForLogo($logo);
 					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 				} else {
 					$pdf->SetTextColor(200, 0, 0);
@@ -1022,16 +1022,16 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		// Get contact
 		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP))
 		{
-		    $arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
-		    if (count($arrayidcontact) > 0)
-		    {
-		        $usertmp = new User($this->db);
-		        $usertmp->fetch($arrayidcontact[0]);
-                $posy += 4;
-                $pdf->SetXY($posx, $posy);
-		        $pdf->SetTextColor(0, 0, 60);
-		        $pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
-		    }
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0)
+			{
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
 		}
 
 		$posy += 1;
@@ -1138,7 +1138,7 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	TCPDF		$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
@@ -1157,28 +1157,28 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	 *
 	 *  @param	object			$object    		common object
 	 *  @param	Translate		$outputlangs    langs
-     *  @param	int			   $hidedetails		Do not show line details
-     *  @param	int			   $hidedesc		Do not show desc
-     *  @param	int			   $hideref			Do not show ref
-     *  @return	null
-     */
-    public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-    {
-	    global $conf, $hookmanager;
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @param	int			   $hidedesc		Do not show desc
+	 *  @param	int			   $hideref			Do not show ref
+	 *  @return	null
+	 */
+	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $hookmanager;
 
-	    // Default field style for content
-	    $this->defaultContentsFieldsStyle = array(
-	        'align' => 'R', // R,C,L
-	        'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultContentsFieldsStyle = array(
+			'align' => 'R', // R,C,L
+			'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    // Default field style for content
-	    $this->defaultTitlesFieldsStyle = array(
-	        'align' => 'C', // R,C,L
-	        'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	    );
+		// Default field style for content
+		$this->defaultTitlesFieldsStyle = array(
+			'align' => 'C', // R,C,L
+			'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
 
-	    /*
+		/*
 	     * For exemple
 	    $this->cols['theColKey'] = array(
 	        'rank' => $rank, // int : use for ordering columns
@@ -1196,162 +1196,162 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	    );
 	    */
 
-	    $rank = 0; // do not use negative rank
-	    $this->cols['desc'] = array(
-	        'rank' => $rank,
-	        'width' => false, // only for desc
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Designation', // use lang key is usefull in somme case with module
-	            'align' => 'L',
-	            // 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-	            // 'label' => ' ', // the final label
-	            'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	        'content' => array(
-	            'align' => 'L',
-                'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-	        ),
-	    );
+		$rank = 0; // do not use negative rank
+		$this->cols['desc'] = array(
+			'rank' => $rank,
+			'width' => false, // only for desc
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'align' => 'L',
+				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				// 'label' => ' ', // the final label
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L',
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
 
-	    // PHOTO
-        $rank = $rank + 10;
-        $this->cols['photo'] = array(
-            'rank' => $rank,
-            'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
-            'status' => false,
-            'title' => array(
-                'textkey' => 'Photo',
-                'label' => ' '
-            ),
-            'content' => array(
-                'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-            ),
-            'border-left' => false, // remove left line separator
-        );
+		// PHOTO
+		$rank = $rank + 10;
+		$this->cols['photo'] = array(
+			'rank' => $rank,
+			'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Photo',
+				'label' => ' '
+			),
+			'content' => array(
+				'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'border-left' => false, // remove left line separator
+		);
 
-	    if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
-	    {
-	        $this->cols['photo']['status'] = true;
-	    }
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto))
+		{
+			$this->cols['photo']['status'] = true;
+		}
 
 
-	    $rank = $rank + 10;
-	    $this->cols['vat'] = array(
-	        'rank' => $rank,
-	        'status' => false,
-	        'width' => 16, // in mm
-	        'title' => array(
-	            'textkey' => 'VAT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
-	    {
-	        $this->cols['vat']['status'] = true;
-	    }
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$this->cols['vat']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['subprice'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'PriceUHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['qty'] = array(
-	        'rank' => $rank,
-	        'width' => 16, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'Qty'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    $rank = $rank + 10;
-	    $this->cols['progress'] = array(
-	        'rank' => $rank,
-	        'width' => 19, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Progress'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 10;
+		$this->cols['progress'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Progress'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    if ($this->situationinvoice)
-	    {
-	        $this->cols['progress']['status'] = true;
-	    }
+		if ($this->situationinvoice)
+		{
+			$this->cols['progress']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['unit'] = array(
-	        'rank' => $rank,
-	        'width' => 11, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'Unit'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($conf->global->PRODUCT_USE_UNITS) {
-	        $this->cols['unit']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->cols['unit']['status'] = true;
+		}
 
-	    $rank = $rank + 10;
-	    $this->cols['discount'] = array(
-	        'rank' => $rank,
-	        'width' => 13, // in mm
-	        'status' => false,
-	        'title' => array(
-	            'textkey' => 'ReductionShort'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
-	    if ($this->atleastonediscount) {
-	        $this->cols['discount']['status'] = true;
-	    }
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
 
-	    $rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
-	    $this->cols['totalexcltax'] = array(
-	        'rank' => $rank,
-	        'width' => 26, // in mm
-	        'status' => true,
-	        'title' => array(
-	            'textkey' => 'TotalHT'
-	        ),
-	        'border-left' => true, // add left line separator
-	    );
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
 
-	    // Add extrafields cols
-        if (!empty($object->lines)) {
-            $line = reset($object->lines);
-            $this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
-        }
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
 
-	    $parameters = array(
-	        'object' => $object,
-	        'outputlangs' => $outputlangs,
-	        'hidedetails' => $hidedetails,
-	        'hidedesc' => $hidedesc,
-	        'hideref' => $hideref
-	    );
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
 
-	    $reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
-	    if ($reshook < 0)
-	    {
-	        setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    } elseif (empty($reshook))
-	    {
-	        $this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
-	    } else {
-	        $this->cols = $hookmanager->resArray;
-	    }
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0)
+		{
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook))
+		{
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
 	}
 }
diff --git a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
index 4c5951dad70..be6d42047ce 100644
--- a/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
+++ b/htdocs/modulebuilder/template/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php
@@ -102,6 +102,19 @@ class InterfaceMyModuleTriggers extends DolibarrTriggers
 		// Put here code you want to execute when a Dolibarr business events occurs.
 		// Data and type of action are stored into $object and $action
 
+		// You can isolate code for each action in a separate method: this method should be named like the trigger in camelCase.
+		// For example : COMPANY_CREATE => public function companyCreate($action, $object, User $user, Translate $langs, Conf $conf)
+		$methodName = lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', strtolower($action)))));
+		$callback = array($this, $methodName);
+		if (is_callable($callback)){
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+
+			return call_user_func($callback, $action, $object, $user, $langs, $conf);
+		};
+
+		// Or you can execute some code here
 		switch ($action) {
 			// Users
 			//case 'USER_CREATE':
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index e05b4e93491..c636853e66e 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -22,25 +22,25 @@
  *  \brief      Tab of events on MyObject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 $res = 0;
@@ -223,13 +223,15 @@ if ($object->id > 0)
 	$objthirdparty = $object;
 	$objcon = new stdClass();
 
-	$out = '&origin='.$object->element.'&originid='.$object->id;
+	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
 	$permok = $user->rights->agenda->myactions->create;
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok)
 	{
 		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
-		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&socid='.urlencode($objthirdparty->id);
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";
@@ -264,7 +266,7 @@ if ($object->id > 0)
 		$filters['search_agenda_label'] = $search_agenda_label;
 
 		// TODO Replace this with same code than into list.php
-		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, 'mymmodule');
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
 	}
 }
 
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 49841fe24b9..c2c24e39e75 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -22,25 +22,25 @@
  *		\brief      Page to create/edit/view myobject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 $res = 0;
@@ -569,7 +569,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element.'@mymodule', (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlright);
 
 		print '</div></div></div>';
 	}
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 46a8d0c3a10..29c4d5ddfcb 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -22,25 +22,25 @@
  *  \brief      Tab for documents linked to MyObject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 $res = 0;
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index b1ec021e774..f0bbb1c60e6 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -22,25 +22,25 @@
  *		\brief      List page for myobject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 $res = 0;
@@ -444,7 +444,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 1a6fd1a4cc6..c1c5b93846d 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -22,25 +22,25 @@
  *  \brief      Tab for notes on MyObject
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN','1');		// Force use of CSRF protection with tokens even for GET
+//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');				// Do not create database handler $db
+//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');				// Do not load object $user
+//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');				// Do not load object $mysoc
+//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');				// Do not load object $langs
+//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');		// Do not check injection attack on GET parameters
+//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');		// Do not check injection attack on POST parameters
+//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');				// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
+//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
+//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');				// Do not check style html tag into posted data
+//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');				// If there is no need to load and show top and left menu
+//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
+//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
+//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');					// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
+//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
+//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
+//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
+//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
+//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 $res = 0;
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index c0d6658cab7..b4a3b56faa8 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -1328,6 +1328,21 @@ class Mo extends CommonObject
 		$tpl = DOL_DOCUMENT_ROOT.'/mrp/tpl/originproductline.tpl.php';
 		$res = include $tpl;
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB 	$db 			Database handler
+	 * @param int 		$origin_id 		Old thirdparty id
+	 * @param int 		$dest_id 		New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	{
+		$tables = array('mrp_production');
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 /**
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index add7de31b56..e20a57a6e4d 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -107,75 +107,75 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    $backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
+	$backurlforlist = dol_buildpath('/mrp/mo_list.php', 1);
 
-    if (empty($backtopage) || ($cancel && empty($id))) {
-    	if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-	    	if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
-    		else $backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
-    	}
-    }
-    if ($cancel && !empty($backtopageforcancel)) {
-    	$backtopage = $backtopageforcancel;
-    }
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = DOL_URL_ROOT.'/mrp/mo_card.php?id='.($id > 0 ? $id : '__ID__');
+		}
+	}
+	if ($cancel && !empty($backtopageforcancel)) {
+		$backtopage = $backtopageforcancel;
+	}
 
-    $triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
+	$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MO_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
-    $trackid = 'mo'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MO_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MO_TO';
+	$trackid = 'mo'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Action to move up and down lines of object
-    //include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';	// Must be include, not include_once
 
-    if ($action == 'set_thirdparty' && $permissiontoadd)
-    {
-    	$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
-    }
-    if ($action == 'classin' && $permissiontoadd)
-    {
-    	$object->setProject(GETPOST('projectid', 'int'));
-    }
+	if ($action == 'set_thirdparty' && $permissiontoadd)
+	{
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MO_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd)
+	{
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
 
-    // Action close produced
-    if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
-    {
-    	$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
-    	if ($result >= 0)
-    	{
-    		// Define output language
-    		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
-    		{
-    			$outputlangs = $langs;
-    			$newlang = '';
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
-    			if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-    			if (!empty($newlang)) {
-    				$outputlangs = new Translate("", $conf);
-    				$outputlangs->setDefaultLang($newlang);
-    			}
-    			$model = $object->model_pdf;
-    			$ret = $object->fetch($id); // Reload to get new records
+	// Action close produced
+	if ($action == 'confirm_produced' && $confirm == 'yes' && $permissiontoadd)
+	{
+		$result = $object->setStatut($object::STATUS_PRODUCED, 0, '', 'MRP_MO_PRODUCED');
+		if ($result >= 0)
+		{
+			// Define output language
+			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
+			{
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model = $object->model_pdf;
+				$ret = $object->fetch($id); // Reload to get new records
 
-    			$object->generateDocument($model, $outputlangs, 0, 0, 0);
-    		}
-    	} else {
-    		setEventMessages($object->error, $object->errors, 'errors');
-    	}
-    }
+				$object->generateDocument($model, $outputlangs, 0, 0, 0);
+			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	}
 }
 
 
@@ -317,7 +317,7 @@ if (($id || $ref) && $action == 'edit')
 	print load_fiche_titre($langs->trans("MO"), '', 'mrp');
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	if ($backtopage) print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -360,7 +360,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation to delete
 	if ($action == 'delete')
 	{
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMo'), $langs->trans('ConfirmDeleteMo'), 'confirm_delete', '', 0, 1);
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline')
@@ -439,32 +439,32 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Project
 	if (!empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    $morehtmlref .= '<br>'.$langs->trans('Project').' ';
-	    if ($permissiontoadd)
-	    {
-	        if ($action != 'classify')
-	            $morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
-            if ($action == 'classify') {
-                //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
-                $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-                $morehtmlref .= '<input type="hidden" name="action" value="classin">';
-                $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
-                $morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
-                $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-                $morehtmlref .= '</form>';
-            } else {
-                $morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
-	        }
-	    } else {
-	        if (!empty($object->fk_project)) {
-	            $proj = new Project($db);
-	            $proj->fetch($object->fk_project);
-	            $morehtmlref .= ' : '.$proj->getNomUrl();
-	        } else {
-	            $morehtmlref .= '';
-	        }
-	    }
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				$morehtmlref .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->fk_soc, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->fk_soc, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ' : '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
 	}
 	$morehtmlref .= '</div>';
 
@@ -501,167 +501,167 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if (!empty($object->table_element_line))
 	{
-    	// Show object lines
+		// Show object lines
 		//$result = $object->getLinesArray();
 		$object->fetchLines();
 
-    	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
     	<input type="hidden" name="token" value="' . newToken().'">
     	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
     	<input type="hidden" name="mode" value="">
     	<input type="hidden" name="id" value="' . $object->id.'">
     	';
 
-    	/*if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+		/*if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
     	    include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
     	}*/
 
-    	if (!empty($object->lines))
-    	{
-    		print '<div class="div-table-responsive-no-min">';
-    		print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		if (!empty($object->lines))
+		{
+			print '<div class="div-table-responsive-no-min">';
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
-    		print '<tr class="liste_titre">';
-    		print '<td class="liste_titre">'.$langs->trans("Summary").'</td>';
-    		print '<td></td>';
-    		print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td class="liste_titre">'.$langs->trans("Summary").'</td>';
+			print '<td></td>';
+			print '</tr>';
 
-    		print '<tr class="oddeven">';
-    		print '<td>'.$langs->trans("ProductsToConsume").'</td>';
-    		print '<td>';
-    		if (!empty($object->lines))
-    		{
-    			$i = 0;
-    			foreach ($object->lines as $line) {
-    				if ($line->role == 'toconsume') {
-    					if ($i) print ', ';
-    					$tmpproduct = new Product($db);
-    					$tmpproduct->fetch($line->fk_product);
-    					print $tmpproduct->getNomUrl(1);
-    					$i++;
-    				}
-    			}
-    		}
-    		print '</td>';
-    		print '</tr>';
+			print '<tr class="oddeven">';
+			print '<td>'.$langs->trans("ProductsToConsume").'</td>';
+			print '<td>';
+			if (!empty($object->lines))
+			{
+				$i = 0;
+				foreach ($object->lines as $line) {
+					if ($line->role == 'toconsume') {
+						if ($i) print ', ';
+						$tmpproduct = new Product($db);
+						$tmpproduct->fetch($line->fk_product);
+						print $tmpproduct->getNomUrl(1);
+						$i++;
+					}
+				}
+			}
+			print '</td>';
+			print '</tr>';
 
-    		print '<tr class="oddeven">';
-    		print '<td>'.$langs->trans("ProductsToProduce").'</td>';
-    		print '<td>';
-    		if (!empty($object->lines))
-    		{
-    			$i = 0;
-    			foreach ($object->lines as $line) {
-    				if ($line->role == 'toproduce') {
-    					if ($i) print ', ';
-    					$tmpproduct = new Product($db);
-    					$tmpproduct->fetch($line->fk_product);
-    					print $tmpproduct->getNomUrl(1);
-    					$i++;
-    				}
-    			}
-    		}
-    		print '</td>';
-    		print '</tr>';
+			print '<tr class="oddeven">';
+			print '<td>'.$langs->trans("ProductsToProduce").'</td>';
+			print '<td>';
+			if (!empty($object->lines))
+			{
+				$i = 0;
+				foreach ($object->lines as $line) {
+					if ($line->role == 'toproduce') {
+						if ($i) print ', ';
+						$tmpproduct = new Product($db);
+						$tmpproduct->fetch($line->fk_product);
+						print $tmpproduct->getNomUrl(1);
+						$i++;
+					}
+				}
+			}
+			print '</td>';
+			print '</tr>';
 
-    	    print '</table>';
-    	    print '</div>';
-    	}
+			print '</table>';
+			print '</div>';
+		}
 
-    	print "</form>\n";
+		print "</form>\n";
 	}
 
 
 	// Buttons for actions
 
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-    	    // Send
-    		//if (empty($user->socid)) {
-    		//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
-    		//}
+		if (empty($reshook))
+		{
+			// Send
+			//if (empty($user->socid)) {
+			//	print '<a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle">' . $langs->trans('SendMail') . '</a>'."\n";
+			//}
 
-    		// Back to draft
-    		if ($object->status == $object::STATUS_VALIDATED)
-    		{
-	    		if ($permissiontoadd)
-	    		{
-	    			// TODO Add test that production has not started
-	    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
-	    		}
-    		}
+			// Back to draft
+			if ($object->status == $object::STATUS_VALIDATED)
+			{
+				if ($permissiontoadd)
+				{
+					// TODO Add test that production has not started
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
+				}
+			}
 
-            // Modify
-    		if ($object->status == $object::STATUS_DRAFT) {
-	    		if ($permissiontoadd)
-	    		{
-	    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-	    		} else {
-	    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-	    		}
-    		}
+			// Modify
+			if ($object->status == $object::STATUS_DRAFT) {
+				if ($permissiontoadd)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				} else {
+					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
+				}
+			}
 
-    		// Validate
-    		if ($object->status == $object::STATUS_DRAFT)
-    		{
-	    		if ($permissiontoadd)
-	    		{
-	    			if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
-	    		    {
-	    		        print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
-	    		    } else {
-	    		    	$langs->load("errors");
-	    		        print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
-	    		    }
-	    		}
-    		}
+			// Validate
+			if ($object->status == $object::STATUS_DRAFT)
+			{
+				if ($permissiontoadd)
+				{
+					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0))
+					{
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
+					} else {
+						$langs->load("errors");
+						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+					}
+				}
+			}
 
-    		// Clone
-    		if ($permissiontoadd)
-    		{
-    			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->fk_soc.'&action=clone&object=mo">'.$langs->trans("ToClone").'</a>';
-    		}
+			// Clone
+			if ($permissiontoadd)
+			{
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->fk_soc.'&action=clone&object=mo">'.$langs->trans("ToClone").'</a>';
+			}
 
-    		// Cancel - Reopen
-    		if ($permissiontoadd)
-    		{
-    			if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
-    			{
-    				$arrayproduced = $object->fetchLinesLinked('produced', 0);
-    				$nbProduced = 0;
-    				foreach ($arrayproduced as $lineproduced) {
-    					$nbProduced += $lineproduced['qty'];
-    				}
-    				if ($nbProduced > 0) {	// If production has started, we can close it
-    					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
-    				} else {
-    					print '<a class="butActionRefused" href="#" title="'.$langs->trans("GoOnTabProductionToProduceFirst", $langs->transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").'</a>'."\n";
-    				}
+			// Cancel - Reopen
+			if ($permissiontoadd)
+			{
+				if ($object->status == $object::STATUS_VALIDATED || $object->status == $object::STATUS_INPROGRESS)
+				{
+					$arrayproduced = $object->fetchLinesLinked('produced', 0);
+					$nbProduced = 0;
+					foreach ($arrayproduced as $lineproduced) {
+						$nbProduced += $lineproduced['qty'];
+					}
+					if ($nbProduced > 0) {	// If production has started, we can close it
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+					} else {
+						print '<a class="butActionRefused" href="#" title="'.$langs->trans("GoOnTabProductionToProduceFirst", $langs->transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").'</a>'."\n";
+					}
 
-    				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
-    			}
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
+				}
 
-    			if ($object->status == $object::STATUS_PRODUCED || $object->status == $object::STATUS_CANCELED)
-    			{
-    				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("ReOpen").'</a>'."\n";
-    			}
-    		}
+				if ($object->status == $object::STATUS_PRODUCED || $object->status == $object::STATUS_CANCELED)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("ReOpen").'</a>'."\n";
+				}
+			}
 
-    		// Delete (need delete permission, or if draft, just need create/modify permission)
-    		if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
-    		{
-    			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-    		} else {
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			// Delete (need delete permission, or if draft, just need create/modify permission)
+			if ($permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd))
+			{
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
@@ -672,37 +672,37 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Documents
-	    $objref = dol_sanitizeFileName($object->ref);
-	    $relativepath = $objref.'/'.$objref.'.pdf';
-	    $filedir = $conf->mrp->dir_output.'/'.$objref;
-	    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-	    $genallowed = $user->rights->mrp->read; // If you can read, you can build the PDF to read content
-	    $delallowed = $user->rights->mrp->create; // If you can create/edit, you can remove a file on card
-	    print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang);
+		// Documents
+		$objref = dol_sanitizeFileName($object->ref);
+		$relativepath = $objref.'/'.$objref.'.pdf';
+		$filedir = $conf->mrp->dir_output.'/'.$objref;
+		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+		$genallowed = $user->rights->mrp->read; // If you can read, you can build the PDF to read content
+		$delallowed = $user->rights->mrp->create; // If you can create/edit, you can remove a file on card
+		print $formfile->showdocuments('mrp:mo', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $mysoc->default_lang);
 
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    $morehtmlright = '<a href="'.dol_buildpath('/mrp/mo_agenda.php', 1).'?id='.$object->id.'">';
-	    $morehtmlright .= $langs->trans("SeeAll");
-	    $morehtmlright .= '</a>';
+		$morehtmlright = '<a href="'.dol_buildpath('/mrp/mo_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'mo', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'mo', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index b9da34958d4..7734e992d48 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -92,7 +92,7 @@ $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alph
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 // List of fields to search into when doing a "search in all"
@@ -392,7 +392,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 754a83c4770..841e787361b 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -595,7 +595,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<td class="liste_titre center">';
 		//print '<input class="flat" type="text" size="3" name="search_type_mouvement" value="'.dol_escape_htmltag($search_type_mouvement).'">';
 		print '<select id="search_type_mouvement" name="search_type_mouvement" class="maxwidth150">';
-		print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'></option>';
+		print '<option value="" '.(($search_type_mouvement == "") ? 'selected="selected"' : '').'>&nbsp;</option>';
 		print '<option value="0" '.(($search_type_mouvement == "0") ? 'selected="selected"' : '').'>'.$langs->trans('StockIncreaseAfterCorrectTransfer').'</option>';
 		print '<option value="1" '.(($search_type_mouvement == "1") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecreaseAfterCorrectTransfer').'</option>';
 		print '<option value="2" '.(($search_type_mouvement == "2") ? 'selected="selected"' : '').'>'.$langs->trans('StockDecrease').'</option>';
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index e86fdc8348d..0d739dbfe91 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -674,7 +674,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	if (!empty($object->table_element_line))
 	{
     	// Show object lines
-    	//$result = $object->getLinesArray();
     	$object->fetchLines();
 
     	print '<div class="fichecenter">';
@@ -721,6 +720,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		print '</tr>';
     	}
 
+    	// Lines to consume
+
     	if (!empty($object->lines))
     	{
     		$nblinetoconsume = 0;
@@ -745,7 +746,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	    		}
 
     	    		print '<tr>';
-    	    		print '<td>'.$tmpproduct->getNomUrl(1).'</td>';
+    	    		print '<td>'.$tmpproduct->getNomUrl(1);
+    	    		print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
+    	    		print '</td>';
     	    		print '<td class="right nowraponall">';
     	    		$help = '';
     	    		if ($line->qty_frozen) $help .= ($help ? '<br>' : '').'<strong>'.$langs->trans("QuantityFrozen").'</strong>: '.yn(1).' ('.$langs->trans("QuantityConsumedInvariable").')';
@@ -850,6 +853,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
    	    print '</table>';
     	print '</div>';
 
+    	// Lines to produce
+
 		print '</div>';
     	print '<div class="fichehalfright">';
     	print '<div class="clearboth"></div>';
@@ -906,7 +911,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     				print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyproduced.'">';
 
     				print '<tr>';
-    				print '<td>'.$tmpproduct->getNomUrl(1).'</td>';
+    				print '<td>'.$tmpproduct->getNomUrl(1);
+    				print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
+    				print '</td>';
     				print '<td class="right">'.$line->qty.'</td>';
     				print '<td class="right nowraponall">';
     				if ($alreadyproduced) {
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index aafc36ca256..bdd86169466 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -42,17 +42,17 @@ if (!$user->admin) accessforbidden();
 //Objects
 $price_globals = new PriceGlobalVariable($db);
 if ($action == 'edit_variable') {
-    $res = $price_globals->fetch($selection);
-    if ($res < 1) {
-        setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-    }
+	$res = $price_globals->fetch($selection);
+	if ($res < 1) {
+		setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+	}
 }
 $price_updaters = new PriceGlobalVariableUpdater($db);
 if ($action == 'edit_updater') {
-    $res = $price_updaters->fetch($selection);
-    if ($res < 1) {
-        setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-    }
+	$res = $price_updaters->fetch($selection);
+	if ($res < 1) {
+		setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+	}
 }
 
 
@@ -61,84 +61,84 @@ if ($action == 'edit_updater') {
  */
 
 if (!empty($action) && empty($cancel)) {
-    //Global variable actions
-    if ($action == 'create_variable' || $action == 'edit_variable') {
-        $price_globals->code = GETPOSTISSET('code') ?GETPOST('code', 'alpha') : $price_globals->code;
-        $price_globals->description = GETPOSTISSET('description') ?GETPOST('description', 'restricthtml') : $price_globals->description;
-        $price_globals->value = GETPOSTISSET('value') ?GETPOST('value', 'int') : $price_globals->value;
-        //Check if record already exists only when saving
-        if (!empty($save)) {
-            foreach ($price_globals->listGlobalVariables() as $entry) {
-                if ($price_globals->id != $entry->id && dol_strtolower($price_globals->code) == dol_strtolower($entry->code)) {
-                    setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
-                    $save = null;
-                }
-            }
-        }
-    }
-    if ($action == 'create_variable' && !empty($save)) {
-        $res = $price_globals->create($user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    } elseif ($action == 'edit_variable' && !empty($save)) {
-        $res = $price_globals->update($user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    } elseif ($action == 'delete_variable') {
-        $res = $price_globals->delete($selection, $user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_globals->error, $price_globals->errors, 'errors');
-        }
-    }
+	//Global variable actions
+	if ($action == 'create_variable' || $action == 'edit_variable') {
+		$price_globals->code = GETPOSTISSET('code') ?GETPOST('code', 'alpha') : $price_globals->code;
+		$price_globals->description = GETPOSTISSET('description') ?GETPOST('description', 'restricthtml') : $price_globals->description;
+		$price_globals->value = GETPOSTISSET('value') ?GETPOST('value', 'int') : $price_globals->value;
+		//Check if record already exists only when saving
+		if (!empty($save)) {
+			foreach ($price_globals->listGlobalVariables() as $entry) {
+				if ($price_globals->id != $entry->id && dol_strtolower($price_globals->code) == dol_strtolower($entry->code)) {
+					setEventMessages($langs->trans("ErrorRecordAlreadyExists"), null, 'errors');
+					$save = null;
+				}
+			}
+		}
+	}
+	if ($action == 'create_variable' && !empty($save)) {
+		$res = $price_globals->create($user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	} elseif ($action == 'edit_variable' && !empty($save)) {
+		$res = $price_globals->update($user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	} elseif ($action == 'delete_variable') {
+		$res = $price_globals->delete($selection, $user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_globals->error, $price_globals->errors, 'errors');
+		}
+	}
 
-    //Updaters actions
-    if ($action == 'create_updater' || $action == 'edit_updater') {
-        $price_updaters->type = GETPOSTISSET('type') ? GETPOST('type', 'int') : $price_updaters->type;
-        $price_updaters->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_updaters->description;
-        $price_updaters->parameters = GETPOSTISSET('parameters') ? GETPOST('parameters', 'alphanohtml') : $price_updaters->parameters;
-        $price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;
-        $price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOST('update_interval', 'int') : $price_updaters->update_interval;
-    }
-    if ($action == 'create_updater' && !empty($save)) {
-        //Verify if process() works
-        $res = $price_updaters->process();
-        if ($res > 0) {
-            $res = $price_updaters->create($user);
-        }
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    } elseif ($action == 'edit_updater' && !empty($save)) {
-        //Verify if process() works
-        $res = $price_updaters->process();
-        if ($res > 0) {
-            $res = $price_updaters->update($user);
-        }
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    } elseif ($action == 'delete_updater') {
-        $res = $price_updaters->delete($selection, $user);
-        if ($res > 0) {
-            $action = '';
-        } else {
-            setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
-        }
-    }
+	//Updaters actions
+	if ($action == 'create_updater' || $action == 'edit_updater') {
+		$price_updaters->type = GETPOSTISSET('type') ? GETPOST('type', 'int') : $price_updaters->type;
+		$price_updaters->description = GETPOSTISSET('description') ? GETPOST('description', 'restricthtml') : $price_updaters->description;
+		$price_updaters->parameters = GETPOSTISSET('parameters') ? GETPOST('parameters', 'alphanohtml') : $price_updaters->parameters;
+		$price_updaters->fk_variable = GETPOSTISSET('fk_variable') ? GETPOST('fk_variable', 'int') : $price_updaters->fk_variable;
+		$price_updaters->update_interval = GETPOSTISSET('update_interval') ? GETPOST('update_interval', 'int') : $price_updaters->update_interval;
+	}
+	if ($action == 'create_updater' && !empty($save)) {
+		//Verify if process() works
+		$res = $price_updaters->process();
+		if ($res > 0) {
+			$res = $price_updaters->create($user);
+		}
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	} elseif ($action == 'edit_updater' && !empty($save)) {
+		//Verify if process() works
+		$res = $price_updaters->process();
+		if ($res > 0) {
+			$res = $price_updaters->update($user);
+		}
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	} elseif ($action == 'delete_updater') {
+		$res = $price_updaters->delete($selection, $user);
+		if ($res > 0) {
+			$action = '';
+		} else {
+			setEventMessages($price_updaters->error, $price_updaters->errors, 'errors');
+		}
+	}
 } elseif (!empty($cancel)) {
-    $action = '';
+	$action = '';
 }
 
 
@@ -159,171 +159,171 @@ print '<br>';
 //Global variables table
 if ($action != 'create_updater' && $action != 'edit_updater')
 {
-    print load_fiche_titre($langs->trans("GlobalVariables"), '', '');
+	print load_fiche_titre($langs->trans("GlobalVariables"), '', '');
 
-    print '<table summary="listofattributes" class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("Variable").'</td>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td>'.$langs->trans("Value").'</td>';
-    print '<td width="80">&nbsp;</td>'; //Space for buttons
-    print '</tr>';
+	print '<table summary="listofattributes" class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("Variable").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->trans("Value").'</td>';
+	print '<td width="80">&nbsp;</td>'; //Space for buttons
+	print '</tr>';
 
-    $arrayglobalvars = $price_globals->listGlobalVariables();
-    if (!empty($arrayglobalvars))
-    {
-	    foreach ($arrayglobalvars as $i=>$entry) {
-	        $var = !$var;
-	        print '<tr class="oddeven">';
-	        print '<td>'.$entry->code.'</td>';
-	        print '<td>'.$entry->description.'</td>';
-	        print '<td>'.price($entry->value).'</td>';
-	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&token='.newToken().'&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
-	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
-	        print '</tr>';
-	    }
-    } else {
-    	print '<tr colspan="7"><td class="opacitymedium">';
-    	print $langs->trans("None");
-    	print '</td></tr>';
-    }
-    print '</table>';
+	$arrayglobalvars = $price_globals->listGlobalVariables();
+	if (!empty($arrayglobalvars))
+	{
+		foreach ($arrayglobalvars as $i=>$entry) {
+			$var = !$var;
+			print '<tr class="oddeven">';
+			print '<td>'.$entry->code.'</td>';
+			print '<td>'.$entry->description.'</td>';
+			print '<td>'.price($entry->value).'</td>';
+			print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_variable&token='.newToken().'&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_variable&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
+			print '</tr>';
+		}
+	} else {
+		print '<tr colspan="7"><td class="opacitymedium">';
+		print $langs->trans("None");
+		print '</td></tr>';
+	}
+	print '</table>';
 
-    if (empty($action))
-    {
-        //Action Buttons
-        print '<div class="tabsAction">';
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';
-        print '</div>';
-        //Separator is only need for updaters table is showed after buttons
-        print '<br><br>';
-    }
+	if (empty($action))
+	{
+		//Action Buttons
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_variable">'.$langs->trans("AddVariable").'</a>';
+		print '</div>';
+		//Separator is only need for updaters table is showed after buttons
+		print '<br><br>';
+	}
 }
 
 //Global variable editor
 if ($action == 'create_variable' || $action == 'edit_variable') {
-    //Form
-    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="'.$action.'">';
-    print '<input type="hidden" name="selection" value="'.$selection.'">';
+	//Form
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="'.$action.'">';
+	print '<input type="hidden" name="selection" value="'.$selection.'">';
 
-    //Table
-    print '<br><table summary="listofattributes" class="border centpercent">';
-    //Code
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Variable").'</td>';
-    print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';
-    print '</tr>';
-    //Description
-    print '<tr>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';
-    print '</tr>';
-    //Value
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Value").'</td>';
-    print '<td class="valeur"><input type="text" name="value" size="10" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';
-    print '</tr>';
-    print '</table>';
+	//Table
+	print '<br><table summary="listofattributes" class="border centpercent">';
+	//Code
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Variable").'</td>';
+	print '<td class="valeur"><input type="text" name="code" size="20" value="'.(empty($price_globals->code) ? '' : $price_globals->code).'"></td>';
+	print '</tr>';
+	//Description
+	print '<tr>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_globals->description) ? '' : $price_globals->description).'"></td>';
+	print '</tr>';
+	//Value
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Value").'</td>';
+	print '<td class="valeur"><input type="text" name="value" size="10" value="'.(empty($price_globals->value) ? '' : $price_globals->value).'"></td>';
+	print '</tr>';
+	print '</table>';
 
-    //Form Buttons
-    print '<br><div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
-    print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-    print '</form>';
+	//Form Buttons
+	print '<br><div class="center">';
+	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
+	print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+	print '</form>';
 }
 
 // Updaters table
 if ($action != 'create_variable' && $action != 'edit_variable')
 {
-    print load_fiche_titre($langs->trans("GlobalVariableUpdaters"), '', '');
+	print load_fiche_titre($langs->trans("GlobalVariableUpdaters"), '', '');
 
-    print '<table summary="listofattributes" class="noborder centpercent">';
-    print '<tr class="liste_titre">';
-    print '<td>'.$langs->trans("VariableToUpdate").'</td>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td>'.$langs->trans("Type").'</td>';
-    print '<td>'.$langs->trans("Parameters").'</td>';
-    print '<td>'.$langs->trans("UpdateInterval").'</td>';
-    print '<td>'.$langs->trans("LastUpdated").'</td>';
-    print '<td width="80">&nbsp;</td>'; //Space for buttons
-    print '</tr>';
+	print '<table summary="listofattributes" class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td>'.$langs->trans("VariableToUpdate").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->trans("Type").'</td>';
+	print '<td>'.$langs->trans("Parameters").'</td>';
+	print '<td>'.$langs->trans("UpdateInterval").'</td>';
+	print '<td>'.$langs->trans("LastUpdated").'</td>';
+	print '<td width="80">&nbsp;</td>'; //Space for buttons
+	print '</tr>';
 
-    $arraypriceupdaters = $price_updaters->listUpdaters();
-    if (!empty($arraypriceupdaters))
-    {
-	    foreach ($arraypriceupdaters as $i=>$entry) {
-	        $code = "";
-	        if ($entry->fk_variable > 0) {
-	            $res = $price_globals->fetch($entry->fk_variable);
-	            if ($res > 0) {
-	                $code = $price_globals->code;
-	            }
-	        }
-	        print '<tr>';
-	        print '<td>'.$code.'</td>';
-	        print '<td>'.$entry->description.'</td>';
-	        print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';
-	        print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
-	        print '<td>'.$entry->update_interval.'</td>';
-	        print '<td>'.$entry->getLastUpdated().'</td>';
-	        print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
-	        print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
-	        print '</tr>';
-	    }
-    } else {
-    	print '<tr><td colspan="7" class="opacitymedium">';
-    	print $langs->trans("None");
-    	print '</td></tr>';
-    }
-    print '</table>';
+	$arraypriceupdaters = $price_updaters->listUpdaters();
+	if (!empty($arraypriceupdaters))
+	{
+		foreach ($arraypriceupdaters as $i=>$entry) {
+			$code = "";
+			if ($entry->fk_variable > 0) {
+				$res = $price_globals->fetch($entry->fk_variable);
+				if ($res > 0) {
+					$code = $price_globals->code;
+				}
+			}
+			print '<tr>';
+			print '<td>'.$code.'</td>';
+			print '<td>'.$entry->description.'</td>';
+			print '<td>'.$langs->trans("GlobalVariableUpdaterType".$entry->type).'</td>';
+			print '<td style="max-width: 250px; word-wrap: break-word; white-space: pre-wrap;">'.$entry->parameters.'</td>';
+			print '<td>'.$entry->update_interval.'</td>';
+			print '<td>'.$entry->getLastUpdated().'</td>';
+			print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit_updater&selection='.$entry->id.'">'.img_edit().'</a> &nbsp;';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_updater&token='.newToken().'&selection='.$entry->id.'">'.img_delete().'</a></td>';
+			print '</tr>';
+		}
+	} else {
+		print '<tr><td colspan="7" class="opacitymedium">';
+		print $langs->trans("None");
+		print '</td></tr>';
+	}
+	print '</table>';
 
-    if (empty($action))
-    {
-        //Action Buttons
-        print '<div class="tabsAction">';
-        print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater&token='.newToken().'">'.$langs->trans("AddUpdater").'</a>';
-        print '</div>';
-    }
+	if (empty($action))
+	{
+		//Action Buttons
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create_updater&token='.newToken().'">'.$langs->trans("AddUpdater").'</a>';
+		print '</div>';
+	}
 }
 
 //Updater editor
 if ($action == 'create_updater' || $action == 'edit_updater') {
-    //Form
-    print '<form id="updaterform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="'.$action.'">';
-    print '<input type="hidden" name="selection" value="'.$selection.'">';
+	//Form
+	print '<form id="updaterform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="'.$action.'">';
+	print '<input type="hidden" name="selection" value="'.$selection.'">';
 
-    //Table
-    print '<br><table summary="listofattributes" class="border centpercent">';
-    //Code
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("VariableToUpdate").'</td><td>';
-    $globals_list = array();
-    foreach ($price_globals->listGlobalVariables() as $entry) {
-        $globals_list[$entry->id] = $entry->code;
-    }
-    print $form->selectarray('fk_variable', $globals_list, (empty($price_updaters->fk_variable) ? 0 : $price_updaters->fk_variable));
-    print '</td></tr>';
-    //Description
-    print '<tr>';
-    print '<td>'.$langs->trans("Description").'</td>';
-    print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';
-    print '</tr>';
-    //Type
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
-    $type = empty($price_updaters->type) ? 0 : $price_updaters->type;
-    $type_list = array();
-    foreach ($price_updaters->types as $val) {
-        $type_list[$val] = $langs->trans("GlobalVariableUpdaterType".$val);
-    }
-    print $form->selectarray('type', $type_list, $type);
-    // This code submits form when type is changed
-    print '<script type="text/javascript">
+	//Table
+	print '<br><table summary="listofattributes" class="border centpercent">';
+	//Code
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("VariableToUpdate").'</td><td>';
+	$globals_list = array();
+	foreach ($price_globals->listGlobalVariables() as $entry) {
+		$globals_list[$entry->id] = $entry->code;
+	}
+	print $form->selectarray('fk_variable', $globals_list, (empty($price_updaters->fk_variable) ? 0 : $price_updaters->fk_variable));
+	print '</td></tr>';
+	//Description
+	print '<tr>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td class="valeur"><input type="text" name="description" size="50" value="'.(empty($price_updaters->description) ? '' : $price_updaters->description).'"></td>';
+	print '</tr>';
+	//Type
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
+	$type = empty($price_updaters->type) ? 0 : $price_updaters->type;
+	$type_list = array();
+	foreach ($price_updaters->types as $val) {
+		$type_list[$val] = $langs->trans("GlobalVariableUpdaterType".$val);
+	}
+	print $form->selectarray('type', $type_list, $type);
+	// This code submits form when type is changed
+	print '<script type="text/javascript">
         jQuery(document).ready(run);
         function run() {
             jQuery("#type").change(on_change);
@@ -332,29 +332,29 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
             jQuery("#updaterform").submit();
         }
     </script>';
-    print '</td></tr>';
-    //Parameters
-    print '<tr>';
-    $help = $langs->trans("GlobalVariableUpdaterHelp".$type).'<br><b>'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).'</b>';
-    print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("Parameters"), $help, 1).'</td><td>';
-    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor = new DolEditor('parameters', empty($price_updaters->parameters) ? '' : $price_updaters->parameters, '', 300, '', '', false, false, false, ROWS_8, '90%');
-    $doleditor->Create();
-    print '</td></tr>';
-    print '</tr>';
-    //Interval
-    print '<tr>';
-    print '<td class="fieldrequired">'.$langs->trans("UpdateInterval").'</td>';
-    print '<td class="valeur"><input type="text" name="update_interval" size="10" value="'.(empty($price_updaters->update_interval) ? '' : $price_updaters->update_interval).'"></td>';
-    print '</tr>';
-    print '</table>';
+	print '</td></tr>';
+	//Parameters
+	print '<tr>';
+	$help = $langs->trans("GlobalVariableUpdaterHelp".$type).'<br><b>'.$langs->trans("GlobalVariableUpdaterHelpFormat".$type).'</b>';
+	print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("Parameters"), $help, 1).'</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('parameters', empty($price_updaters->parameters) ? '' : $price_updaters->parameters, '', 300, '', '', false, false, false, ROWS_8, '90%');
+	$doleditor->Create();
+	print '</td></tr>';
+	print '</tr>';
+	//Interval
+	print '<tr>';
+	print '<td class="fieldrequired">'.$langs->trans("UpdateInterval").'</td>';
+	print '<td class="valeur"><input type="text" name="update_interval" size="10" value="'.(empty($price_updaters->update_interval) ? '' : $price_updaters->update_interval).'"></td>';
+	print '</tr>';
+	print '</table>';
 
-    //Form Buttons
-    print '<br><div class="center">';
-    print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
-    print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
-    print '</div>';
-    print '</form>';
+	//Form Buttons
+	print '<br><div class="center">';
+	print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'"> &nbsp;';
+	print '<input type="submit" class="button" name="cancel" id="cancel" value="'.$langs->trans("Cancel").'">';
+	print '</div>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 4970679eb87..62813ee2a57 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -301,8 +301,8 @@ if (empty($reshook))
 			$object->note_private          	 = dol_htmlcleanlastbr(GETPOST('note_private', 'restricthtml'));
 			$object->note               	 = $object->note_private; // deprecated
 			$object->customcode              = GETPOST('customcode', 'alphanohtml');
-	        $object->country_id = GETPOST('country_id', 'int');
-	        $object->state_id = GETPOST('state_id', 'int');
+			$object->country_id = GETPOST('country_id', 'int');
+			$object->state_id = GETPOST('state_id', 'int');
 			$object->duration_value     	 = $duration_value;
 			$object->duration_unit      	 = $duration_unit;
 			$object->fk_default_warehouse	 = GETPOST('fk_default_warehouse');
@@ -321,8 +321,19 @@ if (empty($reshook))
 			$object->surface_units      	 = GETPOST('surface_units'); // This is not the fk_unit but the power of unit
 			$object->volume             	 = GETPOST('volume');
 			$object->volume_units       	 = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
-			$object->finished           	 = GETPOST('finished', 'alpha');
-			$object->fk_unit = GETPOST('units', 'alpha'); // This is the fk_unit of sale
+			$finished               = GETPOST('finished', 'int');
+			if ($finished > 0) {
+				$object->finished = $finished;
+			} else {
+				$object->finished = null;
+			}
+
+			$units = GETPOST('units', 'int');
+			if ($units > 0) {
+				$object->fk_unit = $units;
+			} else {
+				$object->fk_unit = null;
+			}
 
 			$accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
 			$accountancy_code_sell_intra = GETPOST('accountancy_code_sell_intra', 'alpha');
@@ -435,10 +446,15 @@ if (empty($reshook))
 				$object->surface_units          = GETPOST('surface_units'); // This is not the fk_unit but the power of unit
 				$object->volume                 = GETPOST('volume');
 				$object->volume_units           = GETPOST('volume_units'); // This is not the fk_unit but the power of unit
-				$object->finished               = GETPOST('finished', 'alpha');
+
+				$finished               = GETPOST('finished', 'int');
+				if ($finished >= 0) {
+					$object->finished = $finished;
+				} else {
+					$object->finished = null;
+				}
 
 				$units = GETPOST('units', 'int');
-
 				if ($units > 0) {
 					$object->fk_unit = $units;
 				} else {
@@ -965,14 +981,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$linkback = "";
 		print load_fiche_titre($title, $linkback, $picto);
 
-        // We set country_id, country_code and country for the selected country
-        $object->country_id = GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : null;
-        if ($object->country_id > 0)
-        {
-            $tmparray = getCountry($object->country_id, 'all');
-            $object->country_code = $tmparray['code'];
-            $object->country = $tmparray['label'];
-        }
+		// We set country_id, country_code and country for the selected country
+		$object->country_id = GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : null;
+		if ($object->country_id > 0)
+		{
+			$tmparray = getCountry($object->country_id, 'all');
+			$object->country_code = $tmparray['code'];
+			$object->country = $tmparray['label'];
+		}
 
 		dol_fiche_head('');
 
@@ -1151,26 +1167,26 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Origin country
 			print '<td>'.$langs->trans("CountryOrigin").'</td>';
 			print '<td>';
-            print img_picto('', 'globe-americas', 'class="paddingrightonly"');
-            print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
-            if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+			print img_picto('', 'globe-americas', 'class="paddingrightonly"');
+			print $form->select_country((GETPOSTISSET('country_id') ? GETPOST('country_id') : $object->country_id), 'country_id', '', 0, 'minwidth300 widthcentpercentminusx');
+			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 			print '</td>';
 
-            // State
-            if (empty($conf->global->PRODUCT_DISABLE_STATE))
-            {
-            		if ($conf->browser->layout == 'phone') print '</tr><tr>';
-                if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
-                {
-                    print '<td>'.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                } else {
-                    print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
-                }
+			// State
+			if (empty($conf->global->PRODUCT_DISABLE_STATE))
+			{
+					if ($conf->browser->layout == 'phone') print '</tr><tr>';
+				if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
+				{
+					print '<td>'.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				} else {
+					print '<td>'.$form->editfieldkey('StateOrigin', 'state_id', '', $object, 0).'</td><td colspan="3">';
+				}
 
 				print $formcompany->select_state($object->state_id, $object->country_code);
-                print '</tr>';
-            }
-                print '</tr>';
+				print '</tr>';
+			}
+				print '</tr>';
 		}
 
 		// Other attributes
@@ -1547,8 +1563,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			} else {
 				// Nature
 				print '<tr><td>'.$form->textwithpicto($langs->trans("NatureOfProductShort"), $langs->trans("NatureOfProductDesc")).'</td><td colspan="3">';
-				$statutarray = array('-1'=>'&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
-				print $form->selectarray('finished', $statutarray, $object->finished);
+				print $formproduct->selectProductNature('finished', $object->finished);
 				print '</td></tr>';
 
 				// Brut Weight
@@ -1616,7 +1631,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 				// State
 				if (empty($conf->global->PRODUCT_DISABLE_STATE))
 				{
-            		if ($conf->browser->layout == 'phone') print '</tr><tr>';
+					if ($conf->browser->layout == 'phone') print '</tr><tr>';
 					if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2))
 					{
 						print '<td>'.$form->editfieldkey('Region-StateOrigine', 'state_id', '', $object, 0).'</td><td colspan="3">';
@@ -2389,7 +2404,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete')
 	$objectref = dol_sanitizeFileName($object->ref);
 	$relativepath = $comref.'/'.$objectref.'.pdf';
 	if (!empty($conf->product->multidir_output[$object->entity])) {
-    	$filedir = $conf->product->multidir_output[$object->entity].'/'.$objectref; //Check repertories of current entities
+		$filedir = $conf->product->multidir_output[$object->entity].'/'.$objectref; //Check repertories of current entities
 	} else {
 		$filedir = $conf->product->dir_output.'/'.$objectref;
 	}
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index a0fd2bdb10c..0de89bf78ff 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -425,6 +425,75 @@ class FormProduct
 		return $return;
 	}
 
+	/**
+	 *  Return a combo box with list of units
+	 *  NAture of product labels are defined in llx_c_product_nature
+	 *
+	 *  @param  string		$name                Name of HTML field
+	 *  @param  string		$selected             Preselected value
+	 *  @param  int         $mode                1=Use label as value, 0=Use code
+	 *  @param  int         $showempty           1=show empty value, 0= no
+	 *  @return string
+	 */
+	public function selectProductNature($name = 'finished', $selected = '', $mode = 0, $showempty = 1)
+	{
+		global $langs, $db;
+
+		$langs->load('products');
+
+		$return = '';
+
+		// TODO Use a cache
+		require_once DOL_DOCUMENT_ROOT.'/core/class/cproductnature.class.php';
+		$productNature = new CProductNature($db);
+
+		$filter = array();
+		$filter['t.active'] = 1;
+
+		$result = $productNature->fetchAll(
+			'',
+			'',
+			0,
+			0,
+			$filter
+		);
+		if ($result < 0) {
+			dol_print_error($db);
+			return -1;
+		} else {
+			$return .= '<select class="flat" name="'.$name.'">';
+			if ($showempty || ($selected == '' || $selected == '-1')) {
+				$return .= '<option value="-1"';
+				if ($selected == '' || $selected == '-1') {
+					$return .= ' selected';
+				}
+				$return .= '></option>';
+			}
+			if (!empty($productNature->records) && is_array($productNature->records)) {
+				foreach ($productNature->records as $lines) {
+					$return .= '<option value="';
+					if ($mode == 1) $return .= $lines->label;
+					else $return .= $lines->code;
+
+					$return .= '"';
+
+					if ($mode == 1 && $lines->label == $selected) {
+						$return .= ' selected';
+					} elseif ($lines->code == $selected) {
+						$return .= ' selected';
+					}
+
+					$return .= '>';
+					$return .= $langs->trans($lines->label);
+					$return .= '</option>';
+				}
+			}
+			$return .= '</select>';
+		}
+
+		return $return;
+	}
+
 	/**
 	 *  Return list of lot numbers (stock from product_batch) with stock location and stock qty
 	 *
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 18565347072..2aa9b3330e3 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -983,7 +983,7 @@ class Product extends CommonObject
 			$sql .= ", tosell = ".(int) $this->status;
 			$sql .= ", tobuy = ".(int) $this->status_buy;
 			$sql .= ", tobatch = ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : (int) $this->status_batch);
-			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0) ? "null" : (int) $this->finished);
+			$sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? "null" : (int) $this->finished);
 			$sql .= ", net_measure = ".($this->net_measure != '' ? "'".$this->db->escape($this->net_measure)."'" : 'null');
 			$sql .= ", net_measure_units = ".($this->net_measure_units != '' ? "'".$this->db->escape($this->net_measure_units)."'" : 'null');
 			$sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');
@@ -2357,6 +2357,129 @@ class Product extends CommonObject
 		}
 	}
 
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats OF pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return integer      Tableau des stats dans $this->stats_mo, <0 if ko >0 if ok
+	 */
+	public function load_stats_mo($socid = 0)
+	{
+		// phpcs:enable
+		global $user, $hookmanager;
+
+		$error=0;
+
+		foreach (array('toconsume','consumed','toproduce','produced') as $role) {
+			$this->stats_mo['customers_'.$role] = 0;
+			$this->stats_mo['nb_'.$role] = 0;
+			$this->stats_mo['qty_'.$role] = 0;
+
+			$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
+			$sql .= " SUM(mp.qty) as qty";
+			$sql .= " FROM ".MAIN_DB_PREFIX."mrp_mo as c";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."mrp_production as mp ON mp.fk_mo=c.rowid";
+			if (!$user->rights->societe->client->voir && !$socid) {
+				$sql .= "INNER JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc=c.fk_soc AND sc.fk_user = ".$user->id;
+			}
+			$sql .= " WHERE ";
+			$sql .= " c.entity IN (".getEntity('mo').")";
+
+			$sql .= " AND mp.fk_product =".$this->id;
+			$sql .= " AND mp.role ='".$this->db->escape($role)."'";
+			if ($socid > 0) {
+				$sql .= " AND c.fk_soc = ".$socid;
+			}
+
+			$result = $this->db->query($sql);
+			if ($result) {
+				$obj = $this->db->fetch_object($result);
+				$this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0;
+				$this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0;
+				$this->stats_mo['qty_'.$role] = $obj->qty ? $obj->qty : 0;
+			} else {
+				$this->error = $this->db->error();
+				$error++;
+			}
+		}
+
+		if (!empty($error)) {
+			return -1;
+		}
+
+		$parameters = array('socid' => $socid);
+		$reshook = $hookmanager->executeHooks('loadStatsCustomerMO', $parameters, $this, $action);
+		if ($reshook > 0) $this->stats_mo = $hookmanager->resArray['stats_mo'];
+
+		return 1;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats OF pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return integer      Tableau des stats dans $this->stats_mo, <0 if ko >0 if ok
+	 */
+	public function load_stats_bom($socid = 0)
+	{
+		// phpcs:enable
+		global $user, $hookmanager;
+
+		$error=0;
+
+		$this->stats_bom['nb_toproduce'] = 0;
+		$this->stats_bom['nb_toconsume'] = 0;
+		$this->stats_bom['qty_toproduce'] = 0;
+		$this->stats_bom['qty_toconsume'] = 0;
+
+		$sql = "SELECT COUNT(DISTINCT b.rowid) as nb_toproduce,";
+		$sql .= " b.qty as qty_toproduce";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " WHERE ";
+		$sql .= " b.entity IN (".getEntity('bom').")";
+		$sql .= " AND b.fk_product =".$this->id;
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_bom['nb_toproduce'] = $obj->nb_toproduce ? $obj->nb_toproduce : 0;
+			$this->stats_bom['qty_toproduce'] = $obj->qty_toproduce ? price2num($obj->qty_toproduce) : 0;
+		} else {
+			$this->error = $this->db->error();
+			$error++;
+		}
+
+		$sql = "SELECT COUNT(DISTINCT bl.rowid) as nb_toconsume,";
+		$sql .= " SUM(bl.qty) as qty_toconsume";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " WHERE ";
+		$sql .= " b.entity IN (".getEntity('bom').")";
+		$sql .= " AND bl.fk_product =".$this->id;
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_bom['nb_toconsume'] = $obj->nb_toconsume ? $obj->nb_toconsume : 0;
+			$this->stats_bom['qty_toconsume'] = $obj->qty_toconsume ? price2num($obj->qty_toconsume) : 0;
+		} else {
+			$this->error = $this->db->error();
+			$error++;
+		}
+
+		if (!empty($error)) {
+			return -1;
+		}
+
+		$parameters = array('socid' => $socid);
+		$reshook = $hookmanager->executeHooks('loadStatsCustomerMO', $parameters, $this, $action);
+		if ($reshook > 0) $this->stats_bom = $hookmanager->resArray['stats_bom'];
+
+		return 1;
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
@@ -4562,10 +4685,21 @@ class Product extends CommonObject
 		global $langs;
 		$langs->load('products');
 
-		if ($this->finished == '0') { return $langs->trans("RowMaterial");
-		}
-		if ($this->finished == '1') { return $langs->trans("Finished");
+		if (isset($this->finished) && $this->finished>=0) {
+			$sql = 'SELECT label, code FROM '.MAIN_DB_PREFIX.'c_product_nature where code='.((int) $this->finished).' AND active=1';
+			$resql = $this->db->query($sql);
+			if ($resql && $this->db->num_rows($resql) > 0) {
+				$res = $this->db->fetch_array($resql);
+				$label = $langs->trans($res['label']);
+				$this->db->free($resql);
+				return $label;
+			} else {
+				$this->error = $this->db->error().' sql='.$sql;
+				dol_syslog(__METHOD__.' Error '.$this->error, LOG_ERR);
+				return -1;
+			}
 		}
+
 		return '';
 	}
 
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 1553869d1f1..25a3c5cd836 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -368,7 +368,7 @@ class Productcustomerprice extends CommonObject
 				} elseif ($key == 'prod.ref' || $key == 'prod.label') {
 					$sql .= ' AND '.$key.' LIKE \'%'.$this->db->escape($value).'%\'';
 				} elseif ($key == 't.price' || $key == 't.price_ttc') {
-					$sql .= ' AND ' . $key . ' LIKE \'%' . price2num($value) . '%\'';
+					$sql .= ' AND '.$key.' LIKE \'%'.price2num($value).'%\'';
 				} else {
 					$sql .= ' AND '.$key.' = '.((int) $value);
 				}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index fb1be576ad5..d7bf7c44ae1 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -169,7 +169,7 @@ if (empty($reshook))
 		$supplier_description = GETPOST('supplier_description', 'alpha');
         $barcode = GETPOST('barcode', 'alpha');
         $fk_barcode_type = GETPOST('fk_barcode_type', 'int');
-		$packaging = GETPOST('packaging', 'int');
+		$packaging = price2num(GETPOST("packaging", 'alphanohtml'), 'MS');
 
 		if ($tva_tx == '')
 		{
@@ -230,12 +230,6 @@ if (empty($reshook))
             }
         }
 
-		if (empty($packaging)) $packaging = 1;
-
-		if ($packaging < $quantity) $packaging = $quantity;
-
-		$object->packaging = $packaging;
-
 		if (!$error)
 		{
 			$db->begin();
@@ -296,6 +290,10 @@ if (empty($reshook))
 
 				$newprice = price2num(GETPOST("price", "alpha"));
 
+				if (empty($packaging)) $packaging = 1;
+				if ($packaging < $quantity) $packaging = $quantity;
+				$object->packaging = $packaging;
+
                 if ($conf->multicurrency->enabled)
                 {
                 	$multicurrency_tx = price2num(GETPOST("multicurrency_tx", 'alpha'));
@@ -529,6 +527,23 @@ if ($id > 0 || $ref)
                 }
 				print '</td></tr>';
 
+				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
+					// Packaging
+					print '<tr>';
+
+					print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductDesc")).'</td>';
+					print '<td>';
+					$packaging = GETPOSTISSET('packaging') ? price2num(GETPOST('packaging', 'nohtml'), 'MS') : ((empty($rowid))?"1":price2num($object->packaging, 'MS'));
+					print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
+
+					// Units
+					if ($conf->global->PRODUCT_USE_UNITS) {
+						$unit = $object->getLabelOfUnit();
+						if ($unit !== '') {
+							print '&nbsp;&nbsp;'.$langs->trans($unit);
+						}
+					}
+				}
 				// Vat rate
 				$default_vat = '';
 
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 09947e80ac7..5a19906d088 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -371,7 +371,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index a0bfa073afa..db77e7714f1 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 if (!empty($conf->categorie->enabled))
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
@@ -75,6 +76,7 @@ $search_accountancy_code_sell_export = GETPOST("search_accountancy_code_sell_exp
 $search_accountancy_code_buy = GETPOST("search_accountancy_code_buy", 'alpha');
 $search_accountancy_code_buy_intra = GETPOST("search_accountancy_code_buy_intra", 'alpha');
 $search_accountancy_code_buy_export = GETPOST("search_accountancy_code_buy_export", 'alpha');
+$search_finished = GETPOST("search_finished", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 $type = GETPOST("type", "int");
 
@@ -109,6 +111,7 @@ $hookmanager->initHooks(array('productservicelist'));
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
 $formcompany = new FormCompany($db);
+$formproduct = new FormProduct($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -212,7 +215,7 @@ $arrayfields = array(
 	'p.tobatch'=>array('label'=>$langs->trans("ManageLotSerial"), 'checked'=>0, 'enabled'=>(!empty($conf->productbatch->enabled)), 'position'=>60),
 	'p.fk_country'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>100),
 	'p.fk_state'=>array('label'=>$langs->trans("State"), 'checked'=>0, 'position'=>101),
-  'p.accountancy_code_sell'=>array('label'=>$langs->trans("ProductAccountancySellCode"), 'checked'=>0, 'position'=>400),
+    'p.accountancy_code_sell'=>array('label'=>$langs->trans("ProductAccountancySellCode"), 'checked'=>0, 'position'=>400),
 	'p.accountancy_code_sell_intra'=>array('label'=>$langs->trans("ProductAccountancySellIntraCode"), 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>401),
 	'p.accountancy_code_sell_export'=>array('label'=>$langs->trans("ProductAccountancySellExportCode"), 'checked'=>0, 'position'=>402),
 	'p.accountancy_code_buy'=>array('label'=>$langs->trans("ProductAccountancyBuyCode"), 'checked'=>0, 'position'=>403),
@@ -285,6 +288,7 @@ if (empty($reshook))
 		$search_state = "";
 		$search_vatrate = "";
 		$search_tobatch = '';
+		$search_finished = '';
 		//$search_type='';						// There is 2 types of list: a list of product and a list of services. No list with both. So when we clear search criteria, we must keep the filter on type.
 
 		$show_childproducts = '';
@@ -409,6 +413,7 @@ if ($fourn_id > 0)  $sql .= " AND pfp.fk_soc = ".$fourn_id;
 if ($search_tobatch != '' && $search_tobatch >= 0)   $sql .= " AND p.tobatch = ".$db->escape($search_tobatch);
 if ($search_country)     $sql .= " AND p.fk_country = ".$search_country;
 if ($search_state)     $sql .= " AND p.fk_state = ".$search_state;
+if ($search_finished>=0 && $search_finished!=='') $sql .= " AND p.finished = ".$search_finished;
 if ($search_accountancy_code_sell)        $sql .= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
 if ($search_accountancy_code_sell_intra)  $sql .= natural_search('p.accountancy_code_sell_intra', $search_accountancy_code_sell_intra);
 if ($search_accountancy_code_sell_export) $sql .= natural_search('p.accountancy_code_sell_export', $search_accountancy_code_sell_export);
@@ -522,6 +527,7 @@ if ($resql)
 	if ($search_accountancy_code_buy) $param = "&search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);
 	if ($search_accountancy_code_buy_intra) $param = "&search_accountancy_code_buy_intra=".urlencode($search_accountancy_code_buy_intra);
 	if ($search_accountancy_code_buy_export) $param = "&search_accountancy_code_buy_export=".urlencode($search_accountancy_code_buy_export);
+	if ($search_finished) $param = "&search_finished=".urlencode($search_finished);
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
@@ -593,7 +599,7 @@ if ($resql)
 
 	// Filter on categories
 	$moreforfilter = '';
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		$moreforfilter .= '<div class="divsearchfield">';
 		$moreforfilter .= $langs->trans('Categories').': ';
@@ -677,6 +683,7 @@ if ($resql)
 	if (!empty($arrayfields['p.finished']['checked']))
 	{
 		print '<td class="liste_titre">';
+		print $formproduct->selectProductNature('search_finished', $search_finished);
 		print '</td>';
 	}
 	// Weight
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 847292fa367..c97e22b9166 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -90,94 +90,94 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
-    {
-        $search_soc = '';
-    }
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // All tests are required to be compatible with all browsers
+	{
+		$search_soc = '';
+	}
 
-    if ($action == 'setlabelsellingprice' && $user->admin)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-        $keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.GETPOST('pricelevel');
-        dolibarr_set_const($db, $keyforlabel, GETPOST('labelsellingprice', 'alpha'), 'chaine', 0, '', $conf->entity);
-        $action = '';
-    }
+	if ($action == 'setlabelsellingprice' && $user->admin)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+		$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.GETPOST('pricelevel');
+		dolibarr_set_const($db, $keyforlabel, GETPOST('labelsellingprice', 'alpha'), 'chaine', 0, '', $conf->entity);
+		$action = '';
+	}
 
 	if (($action == 'update_vat') && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer))
 	{
-	    $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+		$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
-	    // We must define tva_tx, npr and local taxes
-	    $tva_tx = $tva_tx_txt;
-	    $vatratecode = '';
-	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    {
-	    	$vat_src_code = $reg[1];
-	    	$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx_txt); // Remove code into vatrate.
-	    }
+		// We must define tva_tx, npr and local taxes
+		$tva_tx = $tva_tx_txt;
+		$vatratecode = '';
+		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		{
+			$vat_src_code = $reg[1];
+			$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx_txt); // Remove code into vatrate.
+		}
 
-	    $tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
-	    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-	    $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-	    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    {
-	        // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
-	        $vatratecode = $reg[1];
-	        // Get record from code
-	        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-	        $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	        $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-	        $resql = $db->query($sql);
-	        if ($resql)
-	        {
-                $obj = $db->fetch_object($resql);
-                $npr = $obj->recuperableonly;
-                $localtax1 = $obj->localtax1;
-                $localtax2 = $obj->localtax2;
-                $localtax1_type = $obj->localtax1_type;
-                $localtax2_type = $obj->localtax2_type;
-	        }
-	    }
+		$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
+		$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+		$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+		{
+			// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in create product.
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
+		}
 
-	    $object->default_vat_code = $vatratecode;
-	    $object->tva_tx = $tva_tx;
-	    $object->tva_npr = $npr;
-	    $object->localtax1_tx = $localtax1;
-	    $object->localtax2_tx = $localtax2;
-	    $object->localtax1_type = $localtax1_type;
-	    $object->localtax2_type = $localtax2_type;
+		$object->default_vat_code = $vatratecode;
+		$object->tva_tx = $tva_tx;
+		$object->tva_npr = $npr;
+		$object->localtax1_tx = $localtax1;
+		$object->localtax2_tx = $localtax2;
+		$object->localtax1_type = $localtax1_type;
+		$object->localtax2_type = $localtax2_type;
 
-	    $db->begin();
+		$db->begin();
 
-	    $resql = $object->update($object->id, $user);
-	    if ($resql <= 0)
-	    {
-	        $error++;
-	        setEventMessages($object->error, $object->errors, 'errors');
-	    }
+		$resql = $object->update($object->id, $user);
+		if ($resql <= 0)
+		{
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 
-	    if ($error)
-	    {
-	        //$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
-	        $localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retreive them.
-	        $object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
-	    }
+		if ($error)
+		{
+			//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
+			$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retreive them.
+			$object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
+		}
 
-	    if (!$error)
-	    {
-	        $db->commit();
-	    } else {
-	        $db->rollback();
-	    }
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
 
-	    $action = '';
+		$action = '';
 	}
 
 	if (($action == 'update_price') && !$cancel && $object->getRights()->creer)
-    {
+	{
 		$error = 0;
 		$pricestoupdate = array();
 
@@ -231,41 +231,41 @@ if (empty($reshook))
 				}
 				$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
 
-        	    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+				$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
 				$localtax1 = $newlocaltax1_tx[$i];
 				$localtax1_type = $newlocaltax1_type[$i];
 				$localtax2 = $newlocaltax2_tx[$i];
 				$localtax2_type = $newlocaltax2_type[$i];
-        	    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-        	    {
-        	        // We look into database using code
-        	        $vatratecode = $reg[1];
-        	        // Get record from code
-        	        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-        	        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-        	        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-        	        $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-        	        $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-        	        $resql = $db->query($sql);
-        	        if ($resql)
-        	        {
-        	            $obj = $db->fetch_object($resql);
-        	            $npr = $obj->recuperableonly;
-        	            $localtax1 = $obj->localtax1;
-        	            $localtax2 = $obj->localtax2;
-        	            $localtax1_type = $obj->localtax1_type;
-        	            $localtax2_type = $obj->localtax2_type;
-        	        }
-        	    }
+				if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+				{
+					// We look into database using code
+					$vatratecode = $reg[1];
+					// Get record from code
+					$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+					$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+					$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+					$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+					$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+					$resql = $db->query($sql);
+					if ($resql)
+					{
+						$obj = $db->fetch_object($resql);
+						$npr = $obj->recuperableonly;
+						$localtax1 = $obj->localtax1;
+						$localtax2 = $obj->localtax2;
+						$localtax1_type = $obj->localtax1_type;
+						$localtax2_type = $obj->localtax2_type;
+					}
+				}
 
 				$pricestoupdate[$i] = array(
 					'price' => $newprice[$i],
 					'price_min' => $newprice_min[$i],
 					'price_base_type' => $newpricebase[$i],
-				    'default_vat_code' => $vatratecode,
+					'default_vat_code' => $vatratecode,
 					'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
 					'npr' => $npr, // default_vat_code should be used in priority in a future
-				    'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)  // default_vat_code should be used in priority in a future
+					'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)  // default_vat_code should be used in priority in a future
 				);
 
 				//If autogeneration is enabled, then we only set the first level
@@ -286,45 +286,45 @@ if (empty($reshook))
 			}
 			$tva_tx = price2num(preg_replace('/\*/', '', $tva_tx)); // keep remove all after the numbers and dot
 
-		    $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-		    $localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-		    // If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
-		    if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-		    {
-		        // We look into database using code
-		        $vatratecode = $reg[1];
-		        // Get record from code
-		        $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-		        $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		        $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-		        $resql = $db->query($sql);
-		        if ($resql)
-		        {
-		            $obj = $db->fetch_object($resql);
-		            $npr = $obj->recuperableonly;
-		            $localtax1 = $obj->localtax1;
-		            $localtax2 = $obj->localtax2;
-		            $localtax1_type = $obj->localtax1_type;
-		            $localtax2_type = $obj->localtax2_type;
+			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+			{
+				// We look into database using code
+				$vatratecode = $reg[1];
+				// Get record from code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+				$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
 
-		            // If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
-		            if (in_array($mysoc->country_code, array('ES')))
-		            {
-    		            $localtax1 = get_localtax($tva_tx, 1);
-	   	                $localtax2 = get_localtax($tva_tx, 2);
-		            }
-		        }
-		    }
+					// If spain, we don't use the localtax found into tax record in database with same code, but using the get_localtax rule
+					if (in_array($mysoc->country_code, array('ES')))
+					{
+						$localtax1 = get_localtax($tva_tx, 1);
+	   					$localtax2 = get_localtax($tva_tx, 2);
+					}
+				}
+			}
 			$pricestoupdate[0] = array(
 				'price' => $_POST["price"],
 				'price_min' => $_POST["price_min"],
 				'price_base_type' => $_POST["price_base_type"],
-			    'default_vat_code' => $vatratecode,
+				'default_vat_code' => $vatratecode,
 				'vat_tx' => $tva_tx, // default_vat_code should be used in priority in a future
 				'npr' => $npr, // default_vat_code should be used in priority in a future
-			    'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)   // default_vat_code should be used in priority in a future
+				'localtaxes_array' => array('0'=>$localtax1_type, '1'=>$localtax1, '2'=>$localtax2_type, '3'=>$localtax2)   // default_vat_code should be used in priority in a future
 			);
 		}
 
@@ -348,7 +348,7 @@ if (empty($reshook))
 				}
 
 				if ($object->multiprices[$key] != $newprice || $object->multiprices_min[$key] != $newprice_min || $object->multiprices_base_type[$key] != $val['price_base_type'])
-       				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
+	   				$res = $object->updatePrice($newprice, $val['price_base_type'], $user, $val['vat_tx'], $newprice_min, $key, $val['npr'], $psq, 0, $val['localtaxes_array'], $val['default_vat_code']);
 				else $res = 0;
 
 
@@ -520,24 +520,24 @@ if (empty($reshook))
 		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 		{
-		    // We look into database using code
-		    $vatratecode = $reg[1];
-		    // Get record from code
-		    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-		    $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		    $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-		    $resql = $db->query($sql);
-		    if ($resql)
-		    {
-		        $obj = $db->fetch_object($resql);
-		        $npr = $obj->recuperableonly;
-		        $localtax1 = $obj->localtax1;
-		        $localtax2 = $obj->localtax2;
-		        $localtax1_type = $obj->localtax1_type;
-		        $localtax2_type = $obj->localtax2_type;
-		    }
+			// We look into database using code
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
 		}
 
 		$prodcustprice->default_vat_code = $vatratecode;
@@ -550,14 +550,14 @@ if (empty($reshook))
 
 		if (!($prodcustprice->fk_soc > 0))
 		{
-		    $langs->load("errors");
-		    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
-		    $error++;
-		    $action = 'add_customer_price';
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty")), null, 'errors');
+			$error++;
+			$action = 'add_customer_price';
 		}
 		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE) && $prodcustprice->price_min < $maxpricesupplier)
 		{
-		    $langs->load("errors");
+			$langs->load("errors");
 			setEventMessages($langs->trans("MinimumPriceLimit", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')), null, 'errors');
 			$error++;
 			$action = 'add_customer_price';
@@ -620,24 +620,24 @@ if (empty($reshook))
 		// If value contains the unique code of vat line (new recommanded method), we use it to find npr and local taxes
 		if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
 		{
-		    // We look into database using code
-		    $vatratecode = $reg[1];
-		    // Get record from code
-		    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-		    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-		    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-		    $sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
-		    $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-		    $resql = $db->query($sql);
-		    if ($resql)
-		    {
-		        $obj = $db->fetch_object($resql);
-		        $npr = $obj->recuperableonly;
-		        $localtax1 = $obj->localtax1;
-		        $localtax2 = $obj->localtax2;
-		        $localtax1_type = $obj->localtax1_type;
-		        $localtax2_type = $obj->localtax2_type;
-		    }
+			// We look into database using code
+			$vatratecode = $reg[1];
+			// Get record from code
+			$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+			$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+			$sql .= " AND t.taux = ".$tva_tx." AND t.active = 1";
+			$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+			$resql = $db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				$npr = $obj->recuperableonly;
+				$localtax1 = $obj->localtax1;
+				$localtax2 = $obj->localtax2;
+				$localtax1_type = $obj->localtax1_type;
+				$localtax2_type = $obj->localtax2_type;
+			}
 		}
 
 		$prodcustprice->default_vat_code = $vatratecode;
@@ -770,22 +770,22 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			//print vatrate($object->multiprices_tva_tx[$soc->price_level], true);
 			print '</td></tr>';
 		} else {
-        	// TVA
-        	print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
+			// TVA
+			print '<tr><td>'.$langs->trans("DefaultTaxRate").'</td><td>';
 
-        	$positiverates = '';
-        	if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-        	if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-        	if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-        	if (empty($positiverates)) $positiverates = '0';
-        	echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			$positiverates = '';
+			if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+			if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+			if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+			if (empty($positiverates)) $positiverates = '0';
+			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
 			/*
 			if ($object->default_vat_code)
 	        {
 	            print vatrate($object->tva_tx, true) . ' ('.$object->default_vat_code.')';
 	        }
         	else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
-        	print '</td></tr>';
+			print '</td></tr>';
 		}
 	} else {
 		if (!empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL))  // using this option is a bug. kept for backward compatibility
@@ -795,28 +795,28 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			print '<td colspan="2">'.vatrate($object->multiprices_tva_tx[1], true).'</td>';
 			print '</tr>';
 		} else {
-            // TVA
-	        print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
+			// TVA
+			print '<tr><td class="titlefield">'.$langs->trans("DefaultTaxRate").'</td><td>';
 
-	        $positiverates = '';
-	        if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
-	        if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
-	        if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
-	        if (empty($positiverates)) $positiverates = '0';
-	        echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
-	        /*
+			$positiverates = '';
+			if (price2num($object->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($object->tva_tx);
+			if (price2num($object->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax1_tx);
+			if (price2num($object->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($object->localtax2_tx);
+			if (empty($positiverates)) $positiverates = '0';
+			echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+			/*
 	        if ($object->default_vat_code)
 	        {
 	            print vatrate($object->tva_tx, true) . ' ('.$object->default_vat_code.')';
 	        }
 	        else print vatrate($object->tva_tx . ($object->tva_npr ? '*' : ''), true);*/
-	        print '</td></tr>';
+			print '</td></tr>';
 		}
-	    print '</table>';
+		print '</table>';
 
-	    print '<br>';
+		print '<br>';
 
-	    print '<table class="noborder tableforfield" width="100%">';
+		print '<table class="noborder tableforfield" width="100%">';
 		print '<tr class="liste_titre"><td>';
 		print $langs->trans("PriceLevel");
 		if ($user->admin) print ' <a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editlabelsellingprice&amp;pricelevel='.$i.'&amp;id='.$object->id.'">'.img_edit($langs->trans('EditSellingPriceLabel'), 0).'</a>';
@@ -834,17 +834,17 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 			$keyforlabel = 'PRODUIT_MULTIPRICES_LABEL'.$i;
 			if (preg_match('/editlabelsellingprice/', $action))
 			{
-			    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
-			    print '<input type="hidden" name="token" value="'.newToken().'">';
-			    print '<input type="hidden" name="action" value="setlabelsellingprice">';
-			    print '<input type="hidden" name="pricelevel" value="'.$i.'">';
-			    print $langs->trans("SellingPrice").' '.$i.' - ';
-			    print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
-			    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
-			    print '</form>';
+				print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="setlabelsellingprice">';
+				print '<input type="hidden" name="pricelevel" value="'.$i.'">';
+				print $langs->trans("SellingPrice").' '.$i.' - ';
+				print '<input size="10" class="maxwidthonsmartphone" type="text" name="labelsellingprice" value="'.$conf->global->$keyforlabel.'">';
+				print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
+				print '</form>';
 			} else {
-			    print $langs->trans("SellingPrice").' '.$i;
-			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+				print $langs->trans("SellingPrice").' '.$i;
+				if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 			}
 			print '</td>';
 
@@ -875,7 +875,7 @@ 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 included into a tr instead of a td
 			{
 				print '<tr><td>'.$langs->trans("PriceByQuantity").' '.$i;
-			    if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
+				if (!empty($conf->global->$keyforlabel)) print ' - '.$langs->trans($conf->global->$keyforlabel);
 				print '</td><td colspan="2">';
 
 				if ($object->prices_by_qty[$i] == 1) {
@@ -1102,7 +1102,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 {
 	print "\n".'<div class="tabsAction">'."\n";
 
-    if ($object->isVariant()) {
+	if ($object->isVariant()) {
 		if ($user->rights->produit->creer || $user->rights->service->creer) {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEditVariants")).'">'.$langs->trans("UpdateDefaultPrice").'</a></div>';
 		}
@@ -1128,7 +1128,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit_price&amp;id='.$object->id.'">'.$langs->trans("UpdateLevelPrices").'</a></div>';
 			}
 		}
-    }
+	}
 
 	print "\n</div>\n";
 }
@@ -1176,7 +1176,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 	if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
 	{
-	    print '<!-- Edit price -->'."\n";
+		print '<!-- Edit price -->'."\n";
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update_price">';
@@ -1262,7 +1262,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 		}
 		if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE))
 		{
-		    print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
+			print ' &nbsp; '.$langs->trans("MinimumRecommendedPrice", price($maxpricesupplier, 0, '', 1, -1, -1, 'auto')).' '.img_warning().'</td>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -1282,8 +1282,8 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 		print '<br></form>';
 	} else {
-	    print '<!-- Edit price per level -->'."\n";
-	    ?>
+		print '<!-- Edit price per level -->'."\n";
+		?>
 		<script>
 
 			var showHidePriceRules = function () {
@@ -1347,14 +1347,14 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 			// VAT
 			if (empty($conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL)) {
-			    print '<td>';
-			    print '<input type="hidden" name="tva_tx['.$i.']" value="'.($object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx).'">';
-			    print '<input type="hidden" name="tva_npr['.$i.']" value="'.$object->tva_npr.'">';
-			    print '<input type="hidden" name="localtax1_tx['.$i.']" value="'.$object->localtax1_tx.'">';
-			    print '<input type="hidden" name="localtax1_type['.$i.']" value="'.$object->localtax1_type.'">';
-			    print '<input type="hidden" name="localtax2_tx['.$i.']" value="'.$object->localtax2_tx.'">';
-			    print '<input type="hidden" name="localtax2_type['.$i.']" value="'.$object->localtax2_type.'">';
-			    print '</td>';
+				print '<td>';
+				print '<input type="hidden" name="tva_tx['.$i.']" value="'.($object->default_vat_code ? $object->tva_tx.' ('.$object->default_vat_code.')' : $object->tva_tx).'">';
+				print '<input type="hidden" name="tva_npr['.$i.']" value="'.$object->tva_npr.'">';
+				print '<input type="hidden" name="localtax1_tx['.$i.']" value="'.$object->localtax1_tx.'">';
+				print '<input type="hidden" name="localtax1_type['.$i.']" value="'.$object->localtax1_type.'">';
+				print '<input type="hidden" name="localtax2_tx['.$i.']" value="'.$object->localtax2_tx.'">';
+				print '<input type="hidden" name="localtax2_type['.$i.']" value="'.$object->localtax2_type.'">';
+				print '</td>';
 			} else {
 				// This option is kept for backward compatibility but has no sense
 				print '<td style="text-align: center">';
@@ -1407,211 +1407,211 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 
 if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_default_price') && !in_array($action, array('edit_price', 'edit_vat')))
 {
-    $sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
-    $sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
-    $sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
-    $sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
-    $sql .= " ".MAIN_DB_PREFIX."user as u";
-    $sql .= " WHERE fk_product = ".$object->id;
-    $sql .= " AND p.entity IN (".getEntity('productprice').")";
-    $sql .= " AND p.fk_user_author = u.rowid";
-    if (!empty($socid) && !empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = ".$soc->price_level;
-    $sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
-    // $sql .= $db->plimit();
+	$sql = "SELECT p.rowid, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.default_vat_code, p.recuperableonly, p.localtax1_tx, p.localtax1_type, p.localtax2_tx, p.localtax2_type,";
+	$sql .= " p.price_level, p.price_min, p.price_min_ttc,p.price_by_qty,";
+	$sql .= " p.date_price as dp, p.fk_price_expression, u.rowid as user_id, u.login";
+	$sql .= " FROM ".MAIN_DB_PREFIX."product_price as p,";
+	$sql .= " ".MAIN_DB_PREFIX."user as u";
+	$sql .= " WHERE fk_product = ".$object->id;
+	$sql .= " AND p.entity IN (".getEntity('productprice').")";
+	$sql .= " AND p.fk_user_author = u.rowid";
+	if (!empty($socid) && !empty($conf->global->PRODUIT_MULTIPRICES)) $sql .= " AND p.price_level = ".$soc->price_level;
+	$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
+	// $sql .= $db->plimit();
 
-    $result = $db->query($sql);
-    if ($result)
-    {
-        print '<div class="divlogofpreviouscustomerprice">';
+	$result = $db->query($sql);
+	if ($result)
+	{
+		print '<div class="divlogofpreviouscustomerprice">';
 
-        $num = $db->num_rows($result);
+		$num = $db->num_rows($result);
 
-    	if (!$num)
-    	{
-    		$db->free($result);
+		if (!$num)
+		{
+			$db->free($result);
 
-    		// Il doit au moins y avoir la ligne de prix initial.
-    		// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
-    		//$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
-            if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
-            	$object->updatePrice($object->multiprices[1], $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), $object->multiprices_min[1], 1);
-            } else {
-                $object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
-            }
+			// Il doit au moins y avoir la ligne de prix initial.
+			// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
+			//$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
+			if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
+				$object->updatePrice($object->multiprices[1], $object->multiprices_base_type[1], $user, (empty($object->multiprices_tva_tx[1]) ? 0 : $object->multiprices_tva_tx[1]), $object->multiprices_min[1], 1);
+			} else {
+				$object->updatePrice($object->price, $object->price_base_type, $user, $object->tva_tx, $object->price_min);
+			}
 
-    		$result = $db->query($sql);
-    		$num = $db->num_rows($result);
-    	}
+			$result = $db->query($sql);
+			$num = $db->num_rows($result);
+		}
 
-    	if ($num > 0)
-    	{
-    	    // Default prices or
-    	    // Log of previous customer prices
-    	    $backbutton = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
+		if ($num > 0)
+		{
+			// Default prices or
+			// Log of previous customer prices
+			$backbutton = '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">'.$langs->trans("Back").'</a>';
 
-    		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
-    		else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
-    	    //if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"),'','','','','',$backbutton, 0, 0, 'title_accountancy.png');
-    		//else print_barre_liste($langs->trans("PriceByCustomerLog"),'','','','','','', 0, 0, 'title_accountancy.png');
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"), 0, $_SERVER["PHP_SELF"], '', '', '', $backbutton, 0, $num, 'title_accountancy.png');
+			else print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
+			//if (! empty($conf->global->PRODUIT_CUSTOMER_PRICES)) print_barre_liste($langs->trans("DefaultPrice"),'','','','','',$backbutton, 0, 0, 'title_accountancy.png');
+			//else print_barre_liste($langs->trans("PriceByCustomerLog"),'','','','','','', 0, 0, 'title_accountancy.png');
 
-    		print '<div class="div-table-responsive">';
-    		print '<table class="noborder centpercent">';
+			print '<div class="div-table-responsive">';
+			print '<table class="noborder centpercent">';
 
-    		print '<tr class="liste_titre">';
-    		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
+			print '<tr class="liste_titre">';
+			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
 
-    		if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    			print '<td class="center">'.$langs->trans("PriceLevel").'</td>';
-    		}
-    		if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    			print '<td class="center">'.$langs->trans("Type").'</td>';
-    		}
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				print '<td class="center">'.$langs->trans("PriceLevel").'</td>';
+			}
+			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+				print '<td class="center">'.$langs->trans("Type").'</td>';
+			}
 
-    		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-    		print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
-    		if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
-    		print '<td class="right">'.$langs->trans("HT").'</td>';
-    		print '<td class="right">'.$langs->trans("TTC").'</td>';
-    		if (!empty($conf->dynamicprices->enabled)) {
-    			print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
-    		}
-    		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
-    		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
-    		print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
-    		if ($user->rights->produit->supprimer)
-    			print '<td class="right">&nbsp;</td>';
-    		print '</tr>';
+			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
+			print $conf->global->PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL;
+			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
+			print '<td class="right">'.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("TTC").'</td>';
+			if (!empty($conf->dynamicprices->enabled)) {
+				print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
+			}
+			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+			print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
+			if ($user->rights->produit->supprimer)
+				print '<td class="right">&nbsp;</td>';
+			print '</tr>';
 
-    		$notfirstlineforlevel = array();
+			$notfirstlineforlevel = array();
 
-    		$i = 0;
-    		while ($i < $num)
-    		{
-    			$objp = $db->fetch_object($result);
+			$i = 0;
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($result);
 
-    			print '<tr class="oddeven">';
-    			// Date
-    			print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour")."</td>";
+				print '<tr class="oddeven">';
+				// Date
+				print "<td>".dol_print_date($db->jdate($objp->dp), "dayhour")."</td>";
 
-    			// Price level
-    			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
-    				print '<td class="center">'.$objp->price_level."</td>";
-    			}
-    			// Price by quantity
-    			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			{
-    				$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
-    				print '<td class="center">'.$langs->trans($type)."</td>";
-    			}
+				// Price level
+				if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+					print '<td class="center">'.$objp->price_level."</td>";
+				}
+				// Price by quantity
+				if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+				{
+					$type = ($objp->price_by_qty == 1) ? 'PriceByQuantity' : 'Standard';
+					print '<td class="center">'.$langs->trans($type)."</td>";
+				}
 
-    			print '<td class="center">';
-    			if (empty($objp->price_by_qty)) {
-	    			print $langs->trans($objp->price_base_type);
-    			}
-    			print "</td>";
+				print '<td class="center">';
+				if (empty($objp->price_by_qty)) {
+					print $langs->trans($objp->price_base_type);
+				}
+				print "</td>";
 
-    			if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			{
-    			    print '<td class="right">';
+				if (empty($conf->global->PRODUIT_MULTIPRICES) && empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+				{
+					print '<td class="right">';
 
-    			    if (empty($objp->price_by_qty)) {
-	    			    $positiverates = '';
-	    			    if (price2num($objp->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($objp->tva_tx);
-	    			    if (price2num($objp->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax1_tx);
-	    			    if (price2num($objp->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax2_tx);
-	    			    if (empty($positiverates)) $positiverates = '0';
-	    			    echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', $objp->tva_npr);
+					if (empty($objp->price_by_qty)) {
+						$positiverates = '';
+						if (price2num($objp->tva_tx))         $positiverates .= ($positiverates ? '/' : '').price2num($objp->tva_tx);
+						if (price2num($objp->localtax1_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax1_tx);
+						if (price2num($objp->localtax2_type)) $positiverates .= ($positiverates ? '/' : '').price2num($objp->localtax2_tx);
+						if (empty($positiverates)) $positiverates = '0';
+						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', $objp->tva_npr);
 						/*
 	    			    if ($objp->default_vat_code)
 	    			    {
 	    			        print vatrate($objp->tva_tx, true) . ' ('.$objp->default_vat_code.')';
 	    			    }
 	    			    else print vatrate($objp->tva_tx, true, $objp->recuperableonly);*/
-    			    }
+					}
 
-    			    print "</td>";
-    			}
+					print "</td>";
+				}
 
-    			// Price
-    			if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled))
-    			{
-    				$price_expression = new PriceExpression($db);
-    				$res = $price_expression->fetch($objp->fk_price_expression);
-    				$title = $price_expression->title;
-    				print '<td class="right"></td>';
-    				print '<td class="right"></td>';
-    				print '<td class="right">'.$title."</td>";
-    			} else {
-    				print '<td class="right">';
-    				if (empty($objp->price_by_qty)) {
-    					print price($objp->price);
-    				}
-    				print "</td>";
-    				print '<td class="right">';
-    				if (empty($objp->price_by_qty)) {
-    					print price($objp->price_ttc);
-    				}
-    				print "</td>";
-    				if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
-    					print '<td class="right"></td>';
-    				}
-    			}
+				// Price
+				if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled))
+				{
+					$price_expression = new PriceExpression($db);
+					$res = $price_expression->fetch($objp->fk_price_expression);
+					$title = $price_expression->title;
+					print '<td class="right"></td>';
+					print '<td class="right"></td>';
+					print '<td class="right">'.$title."</td>";
+				} else {
+					print '<td class="right">';
+					if (empty($objp->price_by_qty)) {
+						print price($objp->price);
+					}
+					print "</td>";
+					print '<td class="right">';
+					if (empty($objp->price_by_qty)) {
+						print price($objp->price_ttc);
+					}
+					print "</td>";
+					if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
+						print '<td class="right"></td>';
+					}
+				}
 
-    			print '<td class="right">';
-    			if (empty($objp->price_by_qty)) {
-    				print price($objp->price_min);
-    			}
-    			print '</td>';
+				print '<td class="right">';
+				if (empty($objp->price_by_qty)) {
+					print price($objp->price_min);
+				}
+				print '</td>';
 
-    			print '<td class="right">';
-    			if (empty($objp->price_by_qty)) {
-    				print price($objp->price_min_ttc);
-    			}
-    			print '</td>';
+				print '<td class="right">';
+				if (empty($objp->price_by_qty)) {
+					print price($objp->price_min_ttc);
+				}
+				print '</td>';
 
-    			// User
-    			print '<td class="right">';
-    			if ($objp->user_id > 0) {
-	    			$userstatic = new User($db);
-	    			$userstatic->fetch($objp->user_id);
-	    			print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
-    			}
-    			print '</td>';
+				// User
+				print '<td class="right">';
+				if ($objp->user_id > 0) {
+					$userstatic = new User($db);
+					$userstatic->fetch($objp->user_id);
+					print $userstatic->getNomUrl(1, '', 0, 0, 24, 0, 'login');
+				}
+				print '</td>';
 
-    			// Action
-    			if ($user->rights->produit->supprimer)
-    			{
-    			    $candelete = 0;
-    			    if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
-    			    {
-    			        if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level] = 1;
-    			        else $candelete = 1;
-    			    } elseif ($i > 0) $candelete = 1;
+				// Action
+				if ($user->rights->produit->supprimer)
+				{
+					$candelete = 0;
+					if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))
+					{
+						if (empty($notfirstlineforlevel[$objp->price_level])) $notfirstlineforlevel[$objp->price_level] = 1;
+						else $candelete = 1;
+					} elseif ($i > 0) $candelete = 1;
 
-    				print '<td class="right">';
-    				if ($candelete)
-    				{
-    					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
-    					print img_delete();
-    					print '</a>';
-    				} else print '&nbsp;'; // Can not delete last price (it's current price)
-    				print '</td>';
-    			}
+					print '<td class="right">';
+					if ($candelete)
+					{
+						print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id.'&amp;lineid='.$objp->rowid.'">';
+						print img_delete();
+						print '</a>';
+					} else print '&nbsp;'; // Can not delete last price (it's current price)
+					print '</td>';
+				}
 
-    			print "</tr>\n";
-    			$i++;
-    		}
+				print "</tr>\n";
+				$i++;
+			}
 
-    		$db->free($result);
-    		print "</table>";
-    		print '</div>';
-    		print "<br>";
-    	}
+			$db->free($result);
+			print "</table>";
+			print '</div>';
+			print "<br>";
+		}
 
-    	print '</div>';
-    } else {
-    	dol_print_error($db);
-    }
+		print '</div>';
+	} else {
+		dol_print_error($db);
+	}
 }
 
 
@@ -1819,7 +1819,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		// List of all log of prices by customers
 		print '<!-- list of all log of prices per customer -->'."\n";
 
-	    $filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOST('socid', 'int'));
+		$filter = array('t.fk_product' => $object->id, 't.fk_soc' => GETPOST('socid', 'int'));
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
@@ -1873,18 +1873,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 			foreach ($prodcustprice->lines as $line)
 			{
-			    // Date
-			    $staticsoc = new Societe($db);
-			    $staticsoc->fetch($line->fk_soc);
+				// Date
+				$staticsoc = new Societe($db);
+				$staticsoc->fetch($line->fk_soc);
 
 				$tva_tx = $line->default_vat_code ? $line->tva_tx.' ('.$line->default_vat_code.')' : $line->tva_tx;
 
 				// Line for default price
 				if ($line->price_base_type == 'HT')
 				{
-				    $pu = $line->price;
+					$pu = $line->price;
 				} else {
-				    $pu = $line->price_ttc;
+					$pu = $line->price_ttc;
 				}
 
 				// Local tax is not saved into table of product. We use value linked to VAT code.
@@ -1902,7 +1902,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 				print "<td>".$staticsoc->getNomUrl(1)."</td>";
 				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
-    		    print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
+				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
 				print '<td class="right">';
 
 				$positiverates = '';
@@ -1944,7 +1944,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 	} elseif ($action != 'showlog_default_price' && $action != 'edit_price')
 	{
 		// List of all prices by customers
-        print '<!-- list of all prices per customer -->'."\n";
+		print '<!-- list of all prices per customer -->'."\n";
 
 		// Count total nb of records
 		$nbtotalofrecords = '';
@@ -1969,18 +1969,18 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 
 		if (count($prodcustprice->lines) > 0 || $search_soc)
 		{
-		    $colspan = 8;
-		    //if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") $colspan++;
+			$colspan = 8;
+			//if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") $colspan++;
 
-    		print '<tr class="liste_titre">';
-    		print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="'.$search_soc.'" size="20"></td>';
-    		print '<td class="liste_titre" colspan="'.$colspan.'">&nbsp;</td>';
-    		// Print the search button
-            print '<td class="liste_titre maxwidthsearch">';
-            $searchpicto = $form->showFilterAndCheckAddButtons(0);
-            print $searchpicto;
-            print '</td>';
-    		print '</tr>';
+			print '<tr class="liste_titre">';
+			print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="'.$search_soc.'" size="20"></td>';
+			print '<td class="liste_titre" colspan="'.$colspan.'">&nbsp;</td>';
+			// Print the search button
+			print '<td class="liste_titre maxwidthsearch">';
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+			print '</td>';
+			print '</tr>';
 		}
 
 		print '<tr class="liste_titre">';
@@ -2006,9 +2006,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		// Line for default price
 		if ($object->price_base_type == 'HT')
 		{
-		    $pu = $object->price;
+			$pu = $object->price;
 		} else {
-		    $pu = $object->price_ttc;
+			$pu = $object->price_ttc;
 		}
 
 		// Local tax is not saved into table of product. We use value linked to VAT code.
@@ -2057,16 +2057,16 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print '</td>';
 		if ($user->rights->produit->supprimer || $user->rights->service->supprimer)
 		{
-		    print '<td class="right">';
-		    print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&amp;id='.$object->id.'">';
-		    print img_info($langs->trans('PriceByCustomerLog'));
-		    print '</a>';
-		    print ' ';
-		    print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
-		    print img_edit('default', 0, 'style="vertical-align: middle;"');
-		    print '</a>';
-		    print ' &nbsp; ';
-		    print '</td>';
+			print '<td class="right">';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=showlog_default_price&amp;id='.$object->id.'">';
+			print img_info($langs->trans('PriceByCustomerLog'));
+			print '</a>';
+			print ' ';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=edit_price&amp;id='.$object->id.'">';
+			print img_edit('default', 0, 'style="vertical-align: middle;"');
+			print '</a>';
+			print ' &nbsp; ';
+			print '</td>';
 		}
 		print "</tr>\n";
 
@@ -2083,9 +2083,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 				// Line for default price
 				if ($line->price_base_type == 'HT')
 				{
-				    $pu = $line->price;
+					$pu = $line->price;
 				} else {
-				    $pu = $line->price_ttc;
+					$pu = $line->price_ttc;
 				}
 
 				// Local tax is not saved into table of product. We use value linked to VAT code.
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
new file mode 100644
index 00000000000..6f8ebf3ef58
--- /dev/null
+++ b/htdocs/product/stats/bom.php
@@ -0,0 +1,277 @@
+<?php
+/* Copyright (C) 2003-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2020 Floiran Henry <florian.henry@scopen.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *       \file       htdocs/product/stats/mo.php
+ *       \ingroup    product mo
+ *       \brief      Page of MO referring product
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/class/bom.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('mrp', 'products', 'companies'));
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+
+// Security check
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+if ($user->socid) $socid = $user->socid;
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productstatscontract'));
+
+$mesg = '';
+$option = '';
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) $sortorder = "DESC";
+if (!$sortfield) $sortfield = "b.date_valid";
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+if ($id > 0 || !empty($ref))
+{
+	$product = new Product($db);
+	$result = $product->fetch($id, $ref);
+
+	$object = $product;
+
+	$parameters = array('id'=>$id);
+	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+	llxHeader("", "", $langs->trans("CardProduct".$product->type));
+
+	if ($result > 0)
+	{
+		$head = product_prepare_head($product);
+		$titre = $langs->trans("CardProduct".$product->type);
+		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
+
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
+        print $hookmanager->resPrint;
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+        $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+        $shownav = 1;
+        if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) $shownav = 0;
+
+        dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
+        print '<div class="fichecenter">';
+
+        print '<div class="underbanner clearboth"></div>';
+        print '<table class="border tableforfield" width="100%">';
+
+        $nboflines = show_stats_for_company($product, $socid);
+
+		print "</table>";
+
+        print '</div>';
+        print '<div style="clear:both"></div>';
+
+		dol_fiche_end();
+
+		$now = dol_now();
+
+		//Calcul total qty and amount for global if full scan list
+		$total_qty_toconsume = 0;
+		$total_qty_toproduce = 0;
+		$bom_data_result=array();
+
+
+		//Qauntity  to produce
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql .= " b.qty as qty_toproduce";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
+		$sql .= " WHERE ";
+		$sql .= " b.entity IN (".getEntity('bom').")";
+		$sql .= " AND b.fk_product =".$product->id;
+		$sql .= $db->order($sortfield, $sortorder);
+
+		// Count total nb of records
+		$totalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $db->query($sql);
+			if ($result) {
+				$totalofrecords = $db->num_rows($result);
+				while ($objp = $db->fetch_object($result)) {
+					$total_qty_toproduce += $objp->qty_toproduce;
+				}
+			} else {
+				dol_print_error($db);
+			}
+		}
+		$sql .= $db->plimit($limit + 1, $offset);
+
+		$result = $db->query($sql);
+		if ($result) {
+			$bomtmp = new BOM($db);
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num > 0) {
+				while ($i < min($num, $limit)) {
+					$objp = $db->fetch_object($result);
+					$bomtmp->id = $objp->rowid;
+					$bomtmp->ref = $objp->ref;
+					$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
+					$bom_data_result[$objp->rowid]['qty_toproduce']+=($objp->qty_toproduce > 0 ? $objp->qty_toproduce : 0);
+					$bom_data_result[$objp->rowid]['qty_toconsume']=0;
+					$bom_data_result[$objp->rowid]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour');
+					$bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status, 5);
+					$i++;
+				}
+			}
+		}else {
+			dol_print_error($db);
+		}
+		$db->free($result);
+
+		//Qauntity  to consume
+		$sql = "SELECT b.rowid as rowid, b.ref, b.status, b.date_valid,";
+		$sql .= " SUM(bl.qty) as qty_toconsume";
+		$sql .= " FROM ".MAIN_DB_PREFIX."bom_bom as b";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
+		$sql .= " WHERE ";
+		$sql .= " b.entity IN (".getEntity('bom').")";
+		$sql .= " AND bl.fk_product=".$product->id;
+		$sql .= " GROUP BY b.rowid, b.ref, b.date_valid, b.status";
+		$sql .= $db->order($sortfield, $sortorder);
+
+		// Count total nb of records
+		$totalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$result = $db->query($sql);
+			if ($result) {
+				$totalofrecords = $db->num_rows($result);
+				while ($objp = $db->fetch_object($result)) {
+					$total_qty_toconsume += $objp->qty_toconsume;
+				}
+			} else {
+				dol_print_error($db);
+			}
+		}
+		$sql .= $db->plimit($limit + 1, $offset);
+
+		$result = $db->query($sql);
+		if ($result) {
+			$bomtmp = new BOM($db);
+			$num = $db->num_rows($result);
+			$i = 0;
+			if ($num > 0) {
+				while ($i < min($num, $limit)) {
+					$objp = $db->fetch_object($result);
+					$bomtmp->id = $objp->rowid;
+					$bomtmp->ref = $objp->ref;
+
+					if (!array_key_exists($objp->rowid, $bom_data_result)) {
+						$bom_data_result[$objp->rowid]['link'] = $bomtmp->getNomUrl(1, 'production');
+						$bom_data_result[$objp->rowid]['qty_toproduce']=0;
+						$bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
+						$bom_data_result[$objp->rowid]['date_valid']=dol_print_date($db->jdate($objp->date_valid), 'dayhour');
+						$bom_data_result[$objp->rowid]['status']=$bomtmp->LibStatut($objp->status, 5);
+					} else {
+						$bom_data_result[$objp->rowid]['qty_toconsume']+=($objp->qty_toconsume > 0 ? $objp->qty_toconsume : 0);
+					}
+					$i++;
+				}
+			}
+		}else {
+			dol_print_error($db);
+		}
+		$db->free($result);
+
+
+		if ($limit > 0 && $limit != $conf->liste_limit) $option .= '&limit='.urlencode($limit);
+		if (!empty($id)) $option .= '&id='.$product->id;
+		if (!empty($search_month)) $option .= '&search_month='.urlencode($search_month);
+		if (!empty($search_year)) $option .= '&search_year='.urlencode($search_year);
+
+		print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+		if (!empty($sortfield))
+			print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+		if (!empty($sortorder))
+			print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+
+		print_barre_liste($langs->trans("BOMs"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', count($bom_data_result), count($bom_data_result), '', 0, '', '', $limit, 0, 0, 1);
+
+		if (!empty($page)) $option .= '&page='.urlencode($page);
+
+		print '<div class="div-table-responsive">';
+		print '<table class="tagtable liste listwithfilterbefore" width="100%">';
+
+		print '<tr class="liste_titre">';
+		print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "b.rowid", "", "&amp;id=".$product->id, '', $sortfield, $sortorder);
+		print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "b.date_valid", "", "&amp;id=".$product->id, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre("ToConsume", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("QtyToProduce", $_SERVER["PHP_SELF"], "", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "b.status", "", "&amp;id=".$product->id, '', $sortfield, $sortorder, 'center ');
+		print "</tr>\n";
+
+		if (!empty($bom_data_result)) {
+			foreach ($bom_data_result as $data)
+			{
+				print '<tr class="oddeven">';
+				print '<td>';
+				print $data['link'];
+				print "</td>\n";
+				print "<td align=\"center\">";
+				print $data['date_valid']."</td>";
+				print '<td class="center">'.$data['qty_toconsume'].'</td>';
+				print '<td class="center">'.$data['qty_toproduce'].'</td>';
+				print '<td class="center">'.$data['status'].'</td>';
+				print "</tr>\n";
+			}
+			print '</table>';
+			print '</div>';
+			print '</form>';
+		}
+	}
+} else {
+	dol_print_error();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index d8dfa9053e8..54af6217831 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -85,7 +85,7 @@ if ($id > 0 || !empty($ref))
 		$head = product_prepare_head($product);
 		$titre = $langs->trans("CardProduct".$product->type);
 		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
-		dol_fiche_head($head, 'referers', $titre, -1, $picto);
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
 
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index b0f593f82d9..57051393893 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -375,7 +375,7 @@ if ($search_all)
 
 $moreforfilter = '';
 
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_WAREHOUSE, $search_category_list);
@@ -419,7 +419,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0 || strpos($val['type'], 'sellist:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index 8a02f3a2b41..95123b7c873 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -377,7 +377,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 9ad848cf535..2518f0ee17d 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -630,7 +630,7 @@ if ($search_ref || $search_label || $sall || $salert || $draftorder || GETPOST('
 }
 
 if ($limit > 0 && $limit != $conf->liste_limit) {
-    $filters .= '&limit=' . urlencode($limit);
+    $filters .= '&limit='.urlencode($limit);
 }
 
 $param = (isset($type) ? '&type='.$type : '');
@@ -701,7 +701,7 @@ if (!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entre
 	print '<td class="liste_titre">&nbsp;</td>';
 }
 print '<td class="liste_titre right">';
-if (! empty($conf->global->STOCK_REPLENISH_ADD_CHECKBOX_INCLUDE_DRAFT_ORDER)) {
+if (!empty($conf->global->STOCK_REPLENISH_ADD_CHECKBOX_INCLUDE_DRAFT_ORDER)) {
 	print $langs->trans('IncludeAlsoDraftOrders').'&nbsp;<input type="checkbox" id="draftorder" name="draftorder" '.(!empty($draftchecked) ? $draftchecked : '').'>';
 }
 print '</td>';
@@ -768,7 +768,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			}
 		}
 
-		$stockwarehouse=0;
+		$stockwarehouse = 0;
 		if ($usevirtualstock)
 		{
 			// If option to increase/decrease is not on an object validation, virtual stock may differs from physical stock.
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index adf35d8bc3b..1fb12e7202e 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -448,7 +448,7 @@ print '<input type="hidden" name="addtimemonth" value="'.$tmp['mon'].'">';
 print '<input type="hidden" name="addtimeday" value="'.$tmp['mday'].'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'task');
+dol_fiche_head($head, 'inputperday', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 72128b5e052..26db00aeeca 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -373,7 +373,7 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'task');
+dol_fiche_head($head, 'inputpermonth', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 437c5934c81..29f0aa3608d 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -158,6 +158,7 @@ $search_array_options_task = $extrafields->getOptionalsFromPost('projet_task', '
 /*
  * Actions
  */
+
 $parameters = array('id' => $id, 'taskid' => $taskid, 'projectid' => $projectid);
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
@@ -465,7 +466,7 @@ print '<input type="hidden" name="month" value="'.$month.'">';
 print '<input type="hidden" name="year" value="'.$year.'">';
 
 $head = project_timesheet_prepare_head($mode, $usertoprocess);
-dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'task');
+dol_fiche_head($head, 'inputperweek', $langs->trans('TimeSpent'), -1, 'projecttask');
 
 // Show description of content
 print '<div class="hideonsmartphone opacitymedium">';
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index cbc223f8525..0036ae64353 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2007-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2014-2015 Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2007-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  */
 
 /**
- *       \file       htdocs/product/ajax/products.php
+ *       \file       htdocs/projet/ajax/projects.php
  *       \brief      File to return Ajax response on product list request
  */
 
@@ -33,10 +33,8 @@ if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML'))  define('NOREQUIREHT
 
 require '../../main.inc.php';
 
-$htmlname = GETPOST('htmlname', 'alpha');
+$htmlname = GETPOST('htmlname', 'aZ09');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
 $discard_closed = GETPOST('discardclosed', 'int');
 
 
@@ -44,28 +42,31 @@ $discard_closed = GETPOST('discardclosed', 'int');
  * View
  */
 
-dol_syslog(join(',', $_GET));
+dol_syslog("Call ajax projet/ajax/projects.php");
+//dol_syslog(join(',', $_GET));
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
-// Load translation files required by the page
-$langs->load("main");
-
 top_httphead();
 
-if (empty($htmlname)) return;
+if (empty($htmlname) && !GETPOST('mode', 'aZ09')) return;
 
-$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
-sort($match);
-$idprod = (!empty($match[0]) ? $match[0] : '');
+// Mode to get list of projects
+if (!GETPOST('mode', 'aZ09') || GETPOST('mode', 'aZ09') != 'gettasks') {
+	// When used from jQuery, the search term is added as GET param "term".
+	$searchkey = (GETPOSTISSET($htmlname) ? GETPOST($htmlname, 'aZ09') : '');
 
-if (!GETPOST($htmlname) && !GETPOST($idprod)) return;
+	$formproject = new FormProjets($db);
+	$arrayresult = $formproject->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
+}
 
-// When used from jQuery, the search term is added as GET param "term".
-$searchkey = ((!empty($idprod) && GETPOST($idprod)) ?GETPOST($idprod) : (GETPOST($htmlname) ?GETPOST($htmlname) : ''));
+// Mode to get list of tasks
+if (GETPOST('mode', 'aZ09') == 'gettasks') {
+	$formproject = new FormProjets($db);
+	$formproject->selectTasks((!empty($$socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOST('projectid', 'int'), '');
+	return;
+}
 
-$form = new FormProjets($db);
-$arrayresult = $form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
 
 $db->close();
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index db38e3c02d7..c7e22bfb5cd 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -1183,7 +1183,7 @@ if ($action == 'create' && $user->rights->projet->creer)
 	}
 
 	/*
-     * Boutons actions
+     * Actions Buttons
      */
 	print '<div class="tabsAction">';
 	$parameters = array();
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index cc7e57a89df..69cbb8c86c9 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -178,7 +178,7 @@ class Project extends CommonObject
 	/**
 	 * @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 $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'fk_soc' =>array('type'=>'integer', 'label'=>'Fk soc', 'enabled'=>1, 'visible'=>3, 'position'=>15),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>1, 'position'=>20),
@@ -577,7 +577,7 @@ class Project extends CommonObject
 				$this->opp_percent = $obj->opp_percent;
 				$this->budget_amount = $obj->budget_amount;
 				$this->model_pdf = $obj->model_pdf;
-				$this->modelpdf = $obj->model_pdf;	// deprecated
+				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->usage_opportunity = (int) $obj->usage_opportunity;
 				$this->usage_task = (int) $obj->usage_task;
 				$this->usage_bill_time = (int) $obj->usage_bill_time;
@@ -848,6 +848,45 @@ class Project extends CommonObject
 		}
 	}
 
+	/**
+	 * Return the count of a type of linked elements of this project
+	 *
+	 * @param string	$type			The type of the linked elements (e.g. 'propal', 'order', 'invoice', 'order_supplier', 'invoice_supplier')
+	 * @param string	$tablename		The name of table associated of the type
+	 * @param string	$projectkey 	(optional) Equivalent key to fk_projet for actual type
+	 * @return integer					The count of the linked elements (the count is zero on request error too)
+	 */
+	public function getElementCount($type, $tablename, $projectkey = 'fk_projet')
+	{
+		if ($this->id <= 0) return 0;
+
+		if ($type == 'agenda') {
+			$sql = "SELECT COUNT(id) as nb FROM ".MAIN_DB_PREFIX."actioncomm WHERE fk_project = ".$this->id." AND entity IN (".getEntity('agenda').")";
+		} elseif ($type == 'expensereport') {
+			$sql = "SELECT COUNT(ed.rowid) as nb FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."expensereport_det as ed WHERE e.rowid = ed.fk_expensereport AND e.entity IN (".getEntity('expensereport').") AND ed.fk_projet = ".$this->id;
+		} elseif ($type == 'project_task') {
+			$sql = "SELECT DISTINCT COUNT(pt.rowid) as nb FROM ".MAIN_DB_PREFIX."projet_task as pt WHERE pt.fk_projet = ".$this->id;
+		} elseif ($type == 'project_task_time') {	// Case we want to duplicate line foreach user
+			$sql = "SELECT DISTINCT COUNT(pt.rowid) as nb FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet_task_time as ptt WHERE pt.rowid = ptt.fk_task AND pt.fk_projet = ".$this->id;
+		} elseif ($type == 'stock_mouvement') {
+			$sql = 'SELECT COUNT(ms.rowid) as nb FROM '.MAIN_DB_PREFIX."stock_mouvement as ms, ".MAIN_DB_PREFIX."entrepot as e WHERE e.rowid = ms.fk_entrepot AND e.entity IN (".getEntity('stock').") AND ms.origintype = 'project' AND ms.fk_origin = ".$this->id." AND ms.type_mouvement = 1";
+		} elseif ($type == 'loan') {
+			$sql = 'SELECT COUNT(l.rowid) as nb FROM '.MAIN_DB_PREFIX."loan as l WHERE l.entity IN (".getEntity('loan').") AND l.fk_projet = ".$this->id;
+		} else {
+			$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." = ".$this->id." AND entity IN (".getEntity($type).")";
+		}
+
+		$result = $this->db->query($sql);
+
+		if (!$result) return 0;
+
+		$obj = $this->db->fetch_object($result);
+
+		$this->db->free($result);
+
+		return $obj->nb;
+	}
+
 	/**
 	 * 		Delete tasks with no children first, then task with children recursively
 	 *
@@ -1432,7 +1471,7 @@ class Project extends CommonObject
 				$clone_project->note_public = '';
 			} else {
 				$this->db->begin();
-				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES), '_public');
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_public, ENT_QUOTES|ENT_HTML5), '_public');
 				if ($res < 0)
 				{
 					$this->error .= $clone_project->error;
@@ -1443,7 +1482,7 @@ class Project extends CommonObject
 				}
 
 				$this->db->begin();
-				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES), '_private');
+				$res = $clone_project->update_note(dol_html_entity_decode($clone_project->note_private, ENT_QUOTES|ENT_HTML5), '_private');
 				if ($res < 0)
 				{
 					$this->error .= $clone_project->error;
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 8020477702a..e6cabbf7347 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -1675,7 +1675,7 @@ class Task extends CommonObject
 				$clone_task->note_public = '';
 			} else {
 				$this->db->begin();
-				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES), '_public');
+				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_public, ENT_QUOTES|ENT_HTML5), '_public');
 				if ($res < 0)
 				{
 					$this->error .= $clone_task->error;
@@ -1686,7 +1686,7 @@ class Task extends CommonObject
 				}
 
 				$this->db->begin();
-				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES), '_private');
+				$res = $clone_task->update_note(dol_html_entity_decode($clone_task->note_private, ENT_QUOTES|ENT_HTML5), '_private');
 				if ($res < 0)
 				{
 					$this->error .= $clone_task->error;
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index 8bbdbed9e6a..471e50139f5 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -84,7 +84,7 @@ if ($action == 'addcontact' && $user->rights->projet->creer)
 	}
 }
 
-// bascule du statut d'un contact
+// Change contact's status
 if ($action == 'swapstatut' && $user->rights->projet->creer)
 {
 	if ($object->fetch($id))
@@ -95,7 +95,7 @@ if ($action == 'swapstatut' && $user->rights->projet->creer)
 	}
 }
 
-// Efface un contact
+// Delete a contact
 if (($action == 'deleteline' || $action == 'deletecontact') && $user->rights->projet->creer)
 {
 	$object->fetch($id);
@@ -128,7 +128,7 @@ $userstatic = new User($db);
 
 /* *************************************************************************** */
 /*                                                                             */
-/* Mode vue et edition                                                         */
+/* Edition and view mode                                                       */
 /*                                                                             */
 /* *************************************************************************** */
 
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index 026aeae32d9..966ad4cae92 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -590,21 +590,19 @@ $showdatefilter = 0;
 if (!$showdatefilter)
 {
 	print '<div class="center centpercent">';
-    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
+    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
     print '<input type="hidden" name="token" value="'.newToken().'">';
     print '<input type="hidden" name="tablename" value="'.$tablename.'">';
 	print '<input type="hidden" name="action" value="view">';
-	print '<table class="center"><tr>';
-	print '<td>'.$langs->trans("From").' ';
-	print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0);
-	print '</td>';
-	print '<td>'.$langs->trans("to").' ';
-	print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0);
-	print '</td>';
-	print '<td>';
+	print '<div class="inline-block">';
+	print $form->selectDate($dates, 'dates', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
+	print '</div>';
+	print '<div class="inline-block">';
+	print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
+	print '</div>';
+	print '<div class="inline-block">';
 	print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">';
-	print '</td>';
-	print '</tr></table>';
+	print '</div>';
 	print '</form>';
 	print '</div>';
 
@@ -729,7 +727,7 @@ foreach ($listofreferent as $key => $value)
                                     || !empty($dates) && empty($datee) && $loanSchedule->datep >= $dates && $loanSchedule->datep <= dol_now()
                                     || empty($dates) && !empty($datee) && $loanSchedule->datep <= $datee
                                 ) {
-                                    $total_ht_by_line = -$loanSchedule->amount_capital;
+                                    $total_ht_by_line -= $loanSchedule->amount_capital;
                                 }
                             }
                         }
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 81b7be12e33..3ddd0402db7 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -239,7 +239,7 @@ $linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt
 $linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly btnTitleSelected'));
 
 //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
-print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'generic');
+print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'projecttask');
 
 
 // Get list of tasks in tasksarray and taskarrayfiltered
@@ -262,14 +262,14 @@ if (count($tasksarray) > 0)
 	$tasks = array();
 	$task_dependencies = array();
 	$taskcursor = 0;
-	foreach ($tasksarray as $key => $val)	// Task array are sorted by "project, position, dateo"
+	foreach ($tasksarray as $key => $val)	// Task array are sorted by "project, position, date"
 	{
 		$task->fetch($val->id, '');
 
 		$idparent = ($val->fk_parent ? $val->fk_parent : '-'.$val->fk_project); // If start with -, id is a project id
 
 		$tasks[$taskcursor]['task_id'] = $val->id;
-		$tasks[$taskcursor]['task_alternate_id'] = ($taskcursor + 1); // An id that has same order than position (requird by ganttchart)
+		$tasks[$taskcursor]['task_alternate_id'] = ($taskcursor + 1); // An id that has same order than position (required by ganttchart)
 		$tasks[$taskcursor]['task_project_id'] = $val->fk_project;
 		$tasks[$taskcursor]['task_parent'] = $idparent;
 
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index a2eb2d1938c..af5134ee521 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -109,7 +109,7 @@ if ($search_status == '') $search_status = -1; // -1 or 1
 
 if (!empty($conf->categorie->enabled))
 {
-	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_array", "array");
+	$search_category_array = GETPOST("search_category_".Categorie::TYPE_PROJECT."_list", "array");
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -228,47 +228,47 @@ if (empty($reshook))
 	$uploaddir = $conf->projet->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
-    // Close records
-    if (!$error && $massaction == 'close' && $user->rights->projet->creer)
-    {
-        $db->begin();
+	// Close records
+	if (!$error && $massaction == 'close' && $user->rights->projet->creer)
+	{
+		$db->begin();
 
-        $objecttmp = new $objectclass($db);
-        $nbok = 0;
-        foreach ($toselect as $toselectid)
-        {
-            $result = $objecttmp->fetch($toselectid);
-            if ($result > 0)
-            {
-                $userWrite  = $object->restrictedProjectArea($user, 'write');
-                if ($userWrite > 0 && $objecttmp->statut == 1) {
-                    $result = $objecttmp->setClose($user);
-                    if ($result <= 0) {
-                        setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                        $error++;
-                        break;
-                    } else $nbok++;
-                } elseif ($userWrite <= 0) {
-                    setEventMessages($langs->trans("DontHavePermissionForCloseProject", $objecttmp->ref), null, 'warnings');
-                } else {
-                    setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
-                }
-            } else {
-                setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-                $error++;
-                break;
-            }
-        }
+		$objecttmp = new $objectclass($db);
+		$nbok = 0;
+		foreach ($toselect as $toselectid)
+		{
+			$result = $objecttmp->fetch($toselectid);
+			if ($result > 0)
+			{
+				$userWrite  = $object->restrictedProjectArea($user, 'write');
+				if ($userWrite > 0 && $objecttmp->statut == 1) {
+					$result = $objecttmp->setClose($user);
+					if ($result <= 0) {
+						setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+						$error++;
+						break;
+					} else $nbok++;
+				} elseif ($userWrite <= 0) {
+					setEventMessages($langs->trans("DontHavePermissionForCloseProject", $objecttmp->ref), null, 'warnings');
+				} else {
+					setEventMessages($langs->trans("DontHaveTheValidateStatus", $objecttmp->ref), null, 'warnings');
+				}
+			} else {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			}
+		}
 
-        if (!$error)
-        {
-            if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-            else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    }
+		if (!$error)
+		{
+			if ($nbok > 1) setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+			else setEventMessages($langs->trans("RecordsClosed", $nbok), null, 'mesgs');
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
 }
 
 
@@ -284,7 +284,7 @@ $formproject = new FormProjets($db);
 $title = $langs->trans("Projects");
 
 
-// Get list of project id allowed to user (in a string list separated by coma)
+// Get list of project id allowed to user (in a string list separated by comma)
 $projectsListId = '';
 if (!$user->rights->projet->all->lire) $projectsListId = $object->getProjectsAuthorizedForUser($user, 0, 1, $socid);
 
@@ -386,7 +386,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
 {
 	$result = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller than paging size (filtering), goto and load page 0
 	{
 		$page = 0;
 		$offset = 0;
@@ -447,8 +447,8 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // List of mass actions available
 $arrayofmassactions = array(
 	'generate_doc'=>$langs->trans("ReGeneratePDF"),
-    //'builddoc'=>$langs->trans("PDFMerge"),
-    //'presend'=>$langs->trans("SendByMail"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
 if ($user->rights->projet->creer) $arrayofmassactions['close'] = $langs->trans("Close");
@@ -474,8 +474,8 @@ print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 $texthelp = '';
 if ($search_project_user == $user->id) $texthelp .= $langs->trans("MyProjectsDesc");
 else {
-    if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
-    else $texthelp .= $langs->trans("ProjectsPublicDesc");
+	if ($user->rights->projet->all->lire && !$socid) $texthelp .= $langs->trans("ProjectsDesc");
+	else $texthelp .= $langs->trans("ProjectsPublicDesc");
 }
 
 print_barre_liste($form->textwithpicto($title, $texthelp), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'project', 0, $newcardbutton, '', $limit, 0, 0, 1);
@@ -496,7 +496,7 @@ if ($search_all)
 $moreforfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	$formcategory = new FormCategory($db);
 	$moreforfilter .= $formcategory->getFilterBox(Categorie::TYPE_PROJECT, $search_category_array);
@@ -616,8 +616,8 @@ if (!empty($arrayfields['p.opp_percent']['checked']))
 }
 if (!empty($arrayfields['opp_weighted_amount']['checked']))
 {
-    print '<td class="liste_titre nowrap right">';
-    print '</td>';
+	print '<td class="liste_titre nowrap right">';
+	print '</td>';
 }
 if (!empty($arrayfields['p.budget_amount']['checked']))
 {
@@ -711,8 +711,8 @@ print "</tr>\n";
 
 $i = 0;
 $totalarray = array(
-    'nbfield' => 0,
-    'val' => array(),
+	'nbfield' => 0,
+	'val' => array(),
 );
 while ($i < min($num, $limit))
 {
@@ -732,9 +732,9 @@ while ($i < min($num, $limit))
 	$userAccess = $object->restrictedProjectArea($user); // why this ?
 	if ($userAccess >= 0)
 	{
-	    $socstatic->id = $obj->socid;
-	    $socstatic->name = $obj->name;
-	    $socstatic->email = $obj->email;
+		$socstatic->id = $obj->socid;
+		$socstatic->name = $obj->name;
+		$socstatic->email = $obj->email;
 
 		print '<tr class="oddeven">';
 
@@ -862,19 +862,19 @@ while ($i < min($num, $limit))
 			print '</td>';
 			if (!$i) $totalarray['nbfield']++;
 		}
-        // Opp weighted amount
-        if (!empty($arrayfields['opp_weighted_amount']['checked']))
-        {
-            if (!isset($totalarray['val']['opp_weighted_amount']))  $totalarray['val']['opp_weighted_amount'] = 0;
-            print '<td align="right">';
-            if ($obj->opp_weighted_amount) {
-                print price($obj->opp_weighted_amount, 1, $langs, 1, -1, -1, '');
-                $totalarray['val']['opp_weighted_amount'] += $obj->opp_weighted_amount;
-            }
-            print '</td>';
-            if (!$i) $totalarray['nbfield']++;
-            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
-        }
+		// Opp weighted amount
+		if (!empty($arrayfields['opp_weighted_amount']['checked']))
+		{
+			if (!isset($totalarray['val']['opp_weighted_amount']))  $totalarray['val']['opp_weighted_amount'] = 0;
+			print '<td align="right">';
+			if ($obj->opp_weighted_amount) {
+				print price($obj->opp_weighted_amount, 1, $langs, 1, -1, -1, '');
+				$totalarray['val']['opp_weighted_amount'] += $obj->opp_weighted_amount;
+			}
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+			if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'opp_weighted_amount';
+		}
 		// Budget
 		if (!empty($arrayfields['p.budget_amount']['checked']))
 		{
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 522468257e0..b0c97907f7d 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -492,13 +492,20 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	print load_fiche_titre($langs->trans("NewTask"), '', 'projecttask');
 
-	if ($object->statut == Project::STATUS_CLOSED)
-	{
+	if ($object->statut == Project::STATUS_CLOSED) {
 		print '<div class="warning">';
 		$langs->load("errors");
 		print $langs->trans("WarningProjectClosed");
 		print '</div>';
 	} else {
+		if ($object->statut == Project::STATUS_DRAFT)
+		{
+			print '<div class="warning">';
+			$langs->load("errors");
+			print $langs->trans("WarningProjectDraft");
+			print '</div>';
+		}
+
 		print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="createtask">';
@@ -532,7 +539,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		print '</td></tr>';
 
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>';
-		print '<input type="text" name="label" autofocus class="minwidth500" value="'.$label.'">';
+		print '<input type="text" name="label" autofocus class="minwidth500 maxwidthonsmartphone" value="'.$label.'">';
 		print '</td></tr>';
 
 		// List of projects
@@ -636,7 +643,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly'));
 
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
-	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'generic');
+	print load_fiche_titre($title, $linktotasks.' &nbsp; '.$linktocreatetask, 'projecttask');
 
 	// Get list of tasks in tasksarray and taskarrayfiltered
 	// We need all tasks (even not limited to a user because a task to user can have a parent that is not affected to him).
@@ -697,16 +704,16 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 
 	if (!empty($arrayfields['t.dateo']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtstartday" value="'.$search_dtstartday.'">';
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtstartmonth" value="'.$search_dtstartmonth.'">';
+		print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartday" value="'.$search_dtstartday.'">';
+		print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartmonth" value="'.$search_dtstartmonth.'"></span>';
 		$formother->select_year($search_dtstartyear ? $search_dtstartyear : -1, 'search_dtstartyear', 1, 20, 5);
 		print '</td>';
 	}
 
 	if (!empty($arrayfields['t.datee']['checked'])) {
 		print '<td class="liste_titre center">';
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtendday" value="'.$search_dtendday.'">';
-		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_dtendmonth" value="'.$search_dtendmonth.'">';
+		print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendday" value="'.$search_dtendday.'">';
+		print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendmonth" value="'.$search_dtendmonth.'"></span>';
 		$formother->select_year($search_dtendyear ? $search_dtendyear : -1, 'search_dtendyear', 1, 20, 5);
 		print '</td>';
 	}
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 313fec73721..354109f135b 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -437,7 +437,7 @@ if ($id > 0 || !empty($ref))
 			}
 		}
 
-		// Liste des contacts lies
+		// List of contact line
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Source").'</td>';
 		print '<td>'.$langs->trans("ThirdParty").'</td>';
@@ -491,6 +491,9 @@ if ($id > 0 || !empty($ref))
                     $userstatic->firstname = $tab[$i]['firstname'];
     				$userstatic->photo = $tab[$i]['photo'];
     				$userstatic->login = $tab[$i]['login'];
+    				$userstatic->email = $tab[$i]['email'];
+    				$userstatic->statut = $tab[$i]['statucontact'];
+
                     print $userstatic->getNomUrl(-1);
                 }
                 if ($tab[$i]['source'] == 'external')
@@ -498,6 +501,9 @@ if ($id > 0 || !empty($ref))
                     $contactstatic->id = $tab[$i]['id'];
                     $contactstatic->lastname = $tab[$i]['lastname'];
                     $contactstatic->firstname = $tab[$i]['firstname'];
+                    $contactstatic->email = $tab[$i]['email'];
+                    $contactstatic->statut = $tab[$i]['statucontact'];
+
                     print $contactstatic->getNomUrl(1);
                 }
 				print '</td>';
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 7d1a8354bb3..f2d455f7a04 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -458,7 +458,7 @@ if ($search_all)
 $morehtmlfilter = '';
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 096eb62d0d0..70caf507412 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -86,7 +86,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 	if (!$error)
 	{
 		$object->fetch($id, $ref);
-        $object->oldcopy = clone $object;
+		$object->oldcopy = clone $object;
 
 		$tmparray = explode('_', $_POST['task_parent']);
 		$task_parent = $tmparray[1];
@@ -110,7 +110,7 @@ if ($action == 'update' && !$_POST["cancel"] && $user->rights->projet->creer)
 			$result = $object->update($user);
 			if ($result < 0)
 			{
-			    setEventMessages($object->error, $object->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	} else {
@@ -130,7 +130,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
 			header('Location: '.DOL_URL_ROOT.'/projet/tasks.php?restore_lastsearch_values=1&id='.$projectstatic->id.($withproject ? '&withproject=1' : ''));
 			exit;
 		} else {
-		    setEventMessages($object->error, $object->errors, 'errors');
+			setEventMessages($object->error, $object->errors, 'errors');
 			$action = '';
 		}
 	}
@@ -169,7 +169,7 @@ if ($action == 'builddoc' && $user->rights->projet->creer)
 	if ($result <= 0)
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
-        $action = '';
+		$action = '';
 	}
 }
 
@@ -227,115 +227,115 @@ if ($id > 0 || !empty($ref))
 
 			// Project card
 
-            $linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+			$linkback = '<a href="'.DOL_URL_ROOT.'/projet/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-            $morehtmlref = '<div class="refidno">';
-            // Title
-            $morehtmlref .= $projectstatic->title;
-            // Thirdparty
-            if ($projectstatic->thirdparty->id > 0)
-            {
-                $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
-            }
-            $morehtmlref .= '</div>';
+			$morehtmlref = '<div class="refidno">';
+			// Title
+			$morehtmlref .= $projectstatic->title;
+			// Thirdparty
+			if ($projectstatic->thirdparty->id > 0)
+			{
+				$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
+			}
+			$morehtmlref .= '</div>';
 
-            // Define a complementary filter for search of next/prev ref.
-            if (!$user->rights->projet->all->lire)
-            {
-                $objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
-                $projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
-            }
+			// Define a complementary filter for search of next/prev ref.
+			if (!$user->rights->projet->all->lire)
+			{
+				$objectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 0);
+				$projectstatic->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+			}
 
-            dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+			dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
-            print '<div class="fichecenter">';
-            print '<div class="fichehalfleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border tableforfield centpercent">';
+			print '<table class="border tableforfield centpercent">';
 
-            // Usage
-            print '<tr><td class="tdtop">';
-            print $langs->trans("Usage");
-            print '</td>';
-            print '<td>';
-            if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-            {
-            	print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowOpportunity");
-            	print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
-            	print '<br>';
-            }
-            if (empty($conf->global->PROJECT_HIDE_TASKS))
-            {
-            	print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectFollowTasks");
-            	print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
-            	print '<br>';
-            }
-            if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
-            {
-            	print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
-            	$htmltext = $langs->trans("ProjectBillTimeDescription");
-            	print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
-            	print '<br>';
-            }
-            print '</td></tr>';
+			// Usage
+			print '<tr><td class="tdtop">';
+			print $langs->trans("Usage");
+			print '</td>';
+			print '<td>';
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
+			{
+				print '<input type="checkbox" disabled name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_opportunity ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowOpportunity");
+				print $form->textwithpicto($langs->trans("ProjectFollowOpportunity"), $htmltext);
+				print '<br>';
+			}
+			if (empty($conf->global->PROJECT_HIDE_TASKS))
+			{
+				print '<input type="checkbox" disabled name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_task ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectFollowTasks");
+				print $form->textwithpicto($langs->trans("ProjectFollowTasks"), $htmltext);
+				print '<br>';
+			}
+			if (!empty($conf->global->PROJECT_BILL_TIME_SPENT))
+			{
+				print '<input type="checkbox" disabled name="usage_bill_time"'.(GETPOSTISSET('usage_bill_time') ? (GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_bill_time ? ' checked="checked"' : '')).'"> ';
+				$htmltext = $langs->trans("ProjectBillTimeDescription");
+				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
+				print '<br>';
+			}
+			print '</td></tr>';
 
-            // Visibility
-            print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-            if ($projectstatic->public) print $langs->trans('SharedProject');
-            else print $langs->trans('PrivateProject');
-            print '</td></tr>';
+			// Visibility
+			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
+			if ($projectstatic->public) print $langs->trans('SharedProject');
+			else print $langs->trans('PrivateProject');
+			print '</td></tr>';
 
-            // Date start - end
-            print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
-            $start = dol_print_date($projectstatic->date_start, 'day');
-            print ($start ? $start : '?');
-            $end = dol_print_date($projectstatic->date_end, 'day');
-            print ' - ';
-            print ($end ? $end : '?');
-            if ($projectstatic->hasDelay()) print img_warning("Late");
-            print '</td></tr>';
+			// Date start - end
+			print '<tr><td>'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+			$start = dol_print_date($projectstatic->date_start, 'day');
+			print ($start ? $start : '?');
+			$end = dol_print_date($projectstatic->date_end, 'day');
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($projectstatic->hasDelay()) print img_warning("Late");
+			print '</td></tr>';
 
-            // Budget
-            print '<tr><td>'.$langs->trans("Budget").'</td><td>';
-            if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
-            print '</td></tr>';
+			// Budget
+			print '<tr><td>'.$langs->trans("Budget").'</td><td>';
+			if (strcmp($projectstatic->budget_amount, '')) print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print '</td></tr>';
 
-            // Other attributes
-            $cols = 2;
-            //include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+			// Other attributes
+			$cols = 2;
+			//include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
+			print '</div>';
 
-            print '<div class="fichehalfright">';
-            print '<div class="ficheaddleft">';
-            print '<div class="underbanner clearboth"></div>';
+			print '<div class="fichehalfright">';
+			print '<div class="ficheaddleft">';
+			print '<div class="underbanner clearboth"></div>';
 
-            print '<table class="border centpercent">';
+			print '<table class="border centpercent">';
 
-            // Description
-            print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
-            print nl2br($projectstatic->description);
-            print '</td></tr>';
+			// Description
+			print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+			print nl2br($projectstatic->description);
+			print '</td></tr>';
 
-            // Categories
-            if ($conf->categorie->enabled) {
-                print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
-                print $form->showCategories($projectstatic->id, 'project', 1);
-                print "</td></tr>";
-            }
+			// Categories
+			if ($conf->categorie->enabled) {
+				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+				print $form->showCategories($projectstatic->id, 'project', 1);
+				print "</td></tr>";
+			}
 
-            print '</table>';
+			print '</table>';
 
-            print '</div>';
-            print '</div>';
-            print '</div>';
+			print '</div>';
+			print '</div>';
+			print '</div>';
 
-            print '<div class="clearboth"></div>';
+			print '<div class="clearboth"></div>';
 
 			dol_fiche_end();
 
@@ -440,7 +440,7 @@ if ($id > 0 || !empty($ref))
 			// Other options
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-            print $hookmanager->resPrint;
+			print $hookmanager->resPrint;
 			if (empty($reshook))
 			{
 				print $object->showOptionals($extrafields, 'edit');
@@ -472,8 +472,8 @@ if ($id > 0 || !empty($ref))
 
 			if (!GETPOST('withproject') || empty($projectstatic->id))
 			{
-			    $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
-			    $object->next_prev_filter = " fk_projet in (".$projectsListId.")";
+				$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
+				$object->next_prev_filter = " fk_projet in (".$projectsListId.")";
 			} else $object->next_prev_filter = " fk_projet = ".$projectstatic->id;
 
 			$morehtmlref = '';
@@ -481,17 +481,17 @@ if ($id > 0 || !empty($ref))
 			// Project
 			if (empty($withproject))
 			{
-			    $morehtmlref .= '<div class="refidno">';
-			    $morehtmlref .= $langs->trans("Project").': ';
-			    $morehtmlref .= $projectstatic->getNomUrl(1);
-			    $morehtmlref .= '<br>';
+				$morehtmlref .= '<div class="refidno">';
+				$morehtmlref .= $langs->trans("Project").': ';
+				$morehtmlref .= $projectstatic->getNomUrl(1);
+				$morehtmlref .= '<br>';
 
-			    // Third party
-			    $morehtmlref .= $langs->trans("ThirdParty").': ';
-			    if (!empty($projectstatic->thirdparty)) {
-                    $morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
-			    }
-			    $morehtmlref .= '</div>';
+				// Third party
+				$morehtmlref .= $langs->trans("ThirdParty").': ';
+				if (!empty($projectstatic->thirdparty)) {
+					$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
+				}
+				$morehtmlref .= '</div>';
 			}
 
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
@@ -515,11 +515,11 @@ if ($id > 0 || !empty($ref))
 			// Date start - Date end
 			print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td colspan="3">';
 			$start = dol_print_date($object->date_start, 'dayhour');
-    		print ($start ? $start : '?');
+			print ($start ? $start : '?');
 			$end = dol_print_date($object->date_end, 'dayhour');
-    		print ' - ';
-    		print ($end ? $end : '?');
-    		if ($object->hasDelay()) print img_warning("Late");
+			print ' - ';
+			print ($end ? $end : '?');
+			if ($object->hasDelay()) print img_warning("Late");
 			print '</td></tr>';
 
 			// Planned workload
@@ -584,13 +584,13 @@ if ($id > 0 || !empty($ref))
 			 * Actions
  			 */
 
-		    print '<div class="tabsAction">';
+			print '<div class="tabsAction">';
 
-		    $parameters = array();
-		    $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		    // modified by hook
-		    if (empty($reshook))
-		    {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+			// modified by hook
+			if (empty($reshook))
+			{
 				// Modify
 				if ($user->rights->projet->creer)
 				{
@@ -602,21 +602,21 @@ if ($id > 0 || !empty($ref))
 				// Delete
 				if ($user->rights->projet->supprimer)
 				{
-				    if (!$object->hasChildren() && !$object->hasTimeSpent())
-				    {
+					if (!$object->hasChildren() && !$object->hasTimeSpent())
+					{
 						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'&amp;withproject='.$withproject.'">'.$langs->trans('Delete').'</a>';
-				    } else {
-				        print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
-				    }
+					} else {
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("TaskHasChild").'">'.$langs->trans('Delete').'</a>';
+					}
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
 				}
 
 				print '</div>';
-		    }
+			}
 
-    		print '<div class="fichecenter"><div class="fichehalfleft">';
-    		print '<a name="builddoc"></a>'; // ancre
+			print '<div class="fichecenter"><div class="fichehalfleft">';
+			print '<a name="builddoc"></a>'; // ancre
 
 			/*
 			 * Documents generes
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index 9530757b283..1ab98093984 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -58,6 +58,11 @@ function llxFooterVierge()
 	print '</body></html>';
 }
 
+// For MultiCompany module.
+// Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
+$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) define("DOLENTITY", $entity);
+
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index 1db036f6878..1354dd9611f 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -433,7 +433,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index 04d50c34eb8..b866112bce6 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -114,7 +114,7 @@ if ($conf->use_javascript_ajax)
 		$listofstatus = array(0, 1, 3, 9);
 		foreach ($listofstatus as $status)
 		{
-			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentjobposition->LibStatut($status, 1), ENT_QUOTES), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentjobposition->LibStatut($status, 1), ENT_QUOTES|ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 			if ($status == RecruitmentJobPosition::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
 			if ($status == RecruitmentJobPosition::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus4;
 			if ($status == RecruitmentJobPosition::STATUS_RECRUITED) $colorseries[$status] = $badgeStatus6;
@@ -190,7 +190,7 @@ if ($conf->use_javascript_ajax)
 		$listofstatus = array(0, 1, 3, 5, 8, 9);
 		foreach ($listofstatus as $status)
 		{
-			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentcandidature->LibStatut($status, 1), ENT_QUOTES), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+			$dataseries[] = array(dol_html_entity_decode($staticrecruitmentcandidature->LibStatut($status, 1), ENT_QUOTES|ENT_HTML5), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 			if ($status == RecruitmentCandidature::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
 			if ($status == RecruitmentCandidature::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
 			if ($status == RecruitmentCandidature::STATUS_CONTRACT_PROPOSED) $colorseries[$status] = $badgeStatus4;
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index 24c98a3fbb9..03f558b3d4a 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -433,7 +433,7 @@ foreach ($object->fields as $key => $val)
 	if (!empty($arrayfields['t.'.$key]['checked']))
 	{
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		elseif (strpos($val['type'], 'integer:') === 0) {
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index e170b038e7a..b6be1fb527e 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -257,7 +257,7 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		// Other attributes
 		$parameters = array('objectsrc' => $objectsrc);
 		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-        print $hookmanager->resPrint;
+		print $hookmanager->resPrint;
 		if (empty($reshook))
 		{
 			print $object->showOptionals($extrafields, 'edit');
@@ -279,27 +279,27 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		$formconfirm = '';
 
 		// Confirm deleting resource line
-	    if ($action == 'delete')
-	    {
-	        $formconfirm = $form->formconfirm("card.php?&id=".$object->id, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResource"), "confirm_delete_resource", '', '', 1);
-	    }
+		if ($action == 'delete')
+		{
+			$formconfirm = $form->formconfirm("card.php?&id=".$object->id, $langs->trans("DeleteResource"), $langs->trans("ConfirmDeleteResource"), "confirm_delete_resource", '', '', 1);
+		}
 
-	    // Print form confirm
-	    print $formconfirm;
+		// Print form confirm
+		print $formconfirm;
 
 
-	    $linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&id='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+		$linkback = '<a href="'.DOL_URL_ROOT.'/resource/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&id='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 
-	    $morehtmlref = '<div class="refidno">';
-	    $morehtmlref .= '</div>';
+		$morehtmlref = '<div class="refidno">';
+		$morehtmlref .= '</div>';
 
 
-	    dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
 
-	    print '<div class="fichecenter">';
-	    print '<div class="underbanner clearboth"></div>';
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
 
 		/*---------------------------------------
 		 * View object
@@ -365,13 +365,13 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0)
 		}
 		if ($action != "delete" && $action != "create" && $action != "edit")
 		{
-		    // Delete resource
-		    if ($user->rights->resource->delete)
-		    {
-		        print '<div class="inline-block divButAction">';
-		        print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'" class="butActionDelete">'.$langs->trans('Delete').'</a>';
-		        print '</div>';
-		    }
+			// Delete resource
+			if ($user->rights->resource->delete)
+			{
+				print '<div class="inline-block divButAction">';
+				print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$id.'&amp;action=delete&amp;token='.newToken().'" class="butActionDelete">'.$langs->trans('Delete').'</a>';
+				print '</div>';
+			}
 		}
 	}
 	print '</div>';
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 43756f84405..87f737043ac 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -97,7 +97,6 @@ class Dolresource extends CommonObject
 
     	// Insert request
     	$sql = "INSERT INTO ".MAIN_DB_PREFIX.$this->table_element."(";
-
     	$sql .= "entity,";
     	$sql .= "ref,";
     	$sql .= "description,";
@@ -105,9 +104,7 @@ class Dolresource extends CommonObject
     	$sql .= "fk_code_type_resource,";
     	$sql .= "note_public,";
     	$sql .= "note_private";
-
     	$sql .= ") VALUES (";
-
     	$sql .= $conf->entity.", ";
     	$sql .= " ".(!isset($this->ref) ? 'NULL' : "'".$this->db->escape($this->ref)."'").",";
     	$sql .= " ".(!isset($this->description) ? 'NULL' : "'".$this->db->escape($this->description)."'").",";
@@ -115,7 +112,6 @@ class Dolresource extends CommonObject
     	$sql .= " ".(!isset($this->fk_code_type_resource) ? 'NULL' : "'".$this->db->escape($this->fk_code_type_resource)."'").",";
     	$sql .= " ".(!isset($this->note_public) ? 'NULL' : "'".$this->db->escape($this->note_public)."'").",";
     	$sql .= " ".(!isset($this->note_private) ? 'NULL' : "'".$this->db->escape($this->note_private)."'");
-
     	$sql .= ")";
 
     	$this->db->begin();
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index a8a946e7578..ccf061b50b7 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -108,7 +108,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 if (!$user->rights->resource->read) {
-        accessforbidden();
+		accessforbidden();
 }
 $arrayfields = array(
 		't.ref' => array(
@@ -201,8 +201,8 @@ if ($ret == -1) {
 	$newcardbutton = '';
 	if ($user->rights->resource->write)
 	{
-        $newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
-    }
+		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
+	}
 
 	print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1);
 }
@@ -246,45 +246,45 @@ print "</tr>\n";
 if ($ret)
 {
 	foreach ($object->lines as $resource)
-    {
-        print '<tr class="oddeven">';
+	{
+		print '<tr class="oddeven">';
 
-        if (!empty($arrayfields['t.ref']['checked']))
-        {
-        	print '<td>';
-        	print $resource->getNomUrl(5);
-        	print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-        }
+		if (!empty($arrayfields['t.ref']['checked']))
+		{
+			print '<td>';
+			print $resource->getNomUrl(5);
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
 
-        if (!empty($arrayfields['ty.label']['checked']))
-        {
-        	print '<td>';
-        	print $resource->type_label;
-        	print '</td>';
-	        if (!$i) $totalarray['nbfield']++;
-        }
-        // Extra fields
-        $obj = (Object) $resource->array_options;
-        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		if (!empty($arrayfields['ty.label']['checked']))
+		{
+			print '<td>';
+			print $resource->type_label;
+			print '</td>';
+			if (!$i) $totalarray['nbfield']++;
+		}
+		// Extra fields
+		$obj = (Object) $resource->array_options;
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 
-        print '<td class="center">';
-        print '<a class="editfielda" href="./card.php?action=edit&token='.newToken().'&id='.$resource->id.'">';
-        print img_edit();
-        print '</a>';
-        print '&nbsp;';
-        print '<a href="./card.php?action=delete&token='.newToken().'&id='.$resource->id.'">';
-        print img_delete('', 'class="marginleftonly"');
-        print '</a>';
-        print '</td>';
-        if (!$i) $totalarray['nbfield']++;
+		print '<td class="center">';
+		print '<a class="editfielda" href="./card.php?action=edit&token='.newToken().'&id='.$resource->id.'">';
+		print img_edit();
+		print '</a>';
+		print '&nbsp;';
+		print '<a href="./card.php?action=delete&token='.newToken().'&id='.$resource->id.'">';
+		print img_delete('', 'class="marginleftonly"');
+		print '</a>';
+		print '</td>';
+		if (!$i) $totalarray['nbfield']++;
 
-        print '</tr>';
-    }
+		print '</tr>';
+	}
 } else {
-    $colspan = 1;
-    foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
-    print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index d27ebd79207..d61312dd8d1 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -800,22 +800,24 @@ if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST))
 print '</a></td>';
 print '</tr>';
 
-
-
-print '<tr class="oddeven">';
-print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
-print '<td>&nbsp</td>';
-print '<td class="center">';
-if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
-{
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=0">';
-	print img_picto($langs->trans("Activated"), 'switch_on');
-} else {
-	print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=1">';
-	print img_picto($langs->trans("Disabled"), 'switch_off');
+if (!empty($conf->expedition->enabled)) {
+	if (! empty($conf->global->MAIN_FEATURES_LEVEL)) {	// Visible on experimental only because seems to not be implemented everywhere (only on proposal)
+		print '<tr class="oddeven">';
+		print '<td width="80%">'.$langs->trans("AskForPreferredShippingMethod").'</td>';
+		print '<td>&nbsp</td>';
+		print '<td class="center">';
+		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD))
+		{
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=0">';
+			print img_picto($langs->trans("Activated"), 'switch_on');
+		} else {
+			print '<a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setaskforshippingmet&token='.newToken().'&value=1">';
+			print img_picto($langs->trans("Disabled"), 'switch_off');
+		}
+		print '</a></td>';
+		print '</tr>';
+	}
 }
-print '</a></td>';
-print '</tr>';
 
 // Disable Prospect/Customer thirdparty type
 print '<tr class="oddeven">';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 9e6ad514da6..c51b1878580 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -89,9 +89,9 @@ $canvas = $object->canvas ? $object->canvas : GETPOST("canvas");
 $objcanvas = null;
 if (!empty($canvas))
 {
-    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
-    $objcanvas = new Canvas($db, $action);
-    $objcanvas->getCanvas('thirdparty', 'card', $canvas);
+	require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';
+	$objcanvas = new Canvas($db, $action);
+	$objcanvas->getCanvas('thirdparty', 'card', $canvas);
 }
 
 // Security check
@@ -115,15 +115,15 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if ($cancel)
-    {
-        $action = '';
-        if (!empty($backtopage))
-        {
-            header("Location: ".$backtopage);
-            exit;
-        }
-    }
+	if ($cancel)
+	{
+		$action = '';
+		if (!empty($backtopage))
+		{
+			header("Location: ".$backtopage);
+			exit;
+		}
+	}
 
 	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer)
 	{
@@ -144,7 +144,7 @@ if (empty($reshook))
 
 			if (!$error)
 			{
-			    // TODO Move the merge function into class of object.
+				// TODO Move the merge function into class of object.
 
 				$db->begin();
 
@@ -166,11 +166,11 @@ if (empty($reshook))
 
 				// Concat some data
 				$listofproperties = array(
-				    'note_public', 'note_private'
+					'note_public', 'note_private'
 				);
 				foreach ($listofproperties as $property)
 				{
-				    $object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
+					$object->$property = dol_concatdesc($object->$property, $soc_origin->$property);
 				}
 
 				// Merge extrafields
@@ -178,7 +178,7 @@ if (empty($reshook))
 				{
 					foreach ($soc_origin->array_options as $key => $val)
 					{
-					    if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
+						if (empty($object->array_options[$key])) $object->array_options[$key] = $val;
 					}
 				}
 
@@ -218,6 +218,8 @@ if (empty($reshook))
 				// Move links
 				if (!$error)
 				{
+					// This list is also into the api_thirdparties.class.php
+					// TODO Mutualise the list into object societe.class.php
 					$objects = array(
 						'Adherent' => '/adherents/class/adherent.class.php',
 						'Societe' => '/societe/class/societe.class.php',
@@ -228,6 +230,7 @@ if (empty($reshook))
 						'Facture' => '/compta/facture/class/facture.class.php',
 						'FactureRec' => '/compta/facture/class/facture-rec.class.php',
 						'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
+						'Mo' => '/mrp/class/mo.class.php',
 						'Contact' => '/contact/class/contact.class.php',
 						'Contrat' => '/contrat/class/contrat.class.php',
 						'Expedition' => '/expedition/class/expedition.class.php',
@@ -239,7 +242,8 @@ if (empty($reshook))
 						'Livraison' => '/livraison/class/livraison.class.php',
 						'Product' => '/product/class/product.class.php',
 						'Project' => '/projet/class/project.class.php',
-						'User' => '/user/class/user.class.php',
+						'Ticket' => '/ticket/class/ticket.class.php',
+						'User' => '/user/class/user.class.php'
 					);
 
 					//First, all core objects must update their tables
@@ -299,7 +303,7 @@ if (empty($reshook))
 					setEventMessages($langs->trans('ThirdpartiesMergeSuccess'), null, 'mesgs');
 					$db->commit();
 				} else {
-				    $langs->load("errors");
+					$langs->load("errors");
 					setEventMessages($langs->trans('ErrorsThirdpartyMerge'), null, 'errors');
 					$db->rollback();
 				}
@@ -307,160 +311,160 @@ if (empty($reshook))
 		}
 	}
 
-    if (GETPOST('getcustomercode'))
-    {
-        // We defined value code_client
-        $_POST["customer_code"] = "Acompleter";
-    }
+	if (GETPOST('getcustomercode'))
+	{
+		// We defined value code_client
+		$_POST["customer_code"] = "Acompleter";
+	}
 
-    if (GETPOST('getsuppliercode'))
-    {
-        // We defined value code_fournisseur
-        $_POST["supplier_code"] = "Acompleter";
-    }
+	if (GETPOST('getsuppliercode'))
+	{
+		// We defined value code_fournisseur
+		$_POST["supplier_code"] = "Acompleter";
+	}
 
-    if ($action == 'set_localtax1')
-    {
-    	//obtidre selected del combobox
-    	$value = GETPOST('lt1');
-    	$object->fetch($socid);
-    	$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
-    }
-    if ($action == 'set_localtax2')
-    {
-    	//obtidre selected del combobox
-    	$value = GETPOST('lt2');
-    	$object->fetch($socid);
-    	$res = $object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
-    }
+	if ($action == 'set_localtax1')
+	{
+		//obtidre selected del combobox
+		$value = GETPOST('lt1');
+		$object->fetch($socid);
+		$res = $object->setValueFrom('localtax1_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+	}
+	if ($action == 'set_localtax2')
+	{
+		//obtidre selected del combobox
+		$value = GETPOST('lt2');
+		$object->fetch($socid);
+		$res = $object->setValueFrom('localtax2_value', $value, '', null, 'text', '', $user, 'COMPANY_MODIFY');
+	}
 
-    if ($action == 'update_extras') {
-        $object->fetch($socid);
+	if ($action == 'update_extras') {
+		$object->fetch($socid);
 
-        $object->oldcopy = dol_clone($object);
+		$object->oldcopy = dol_clone($object);
 
-        // Fill array 'array_options' with data from update form
-        $extrafields->fetch_name_optionals_label($object->table_element);
+		// Fill array 'array_options' with data from update form
+		$extrafields->fetch_name_optionals_label($object->table_element);
 
-        $ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
-        if ($ret < 0) $error++;
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) $error++;
 
-        if (!$error)
-        {
-        	$result = $object->insertExtraFields('COMPANY_MODIFY');
-        	if ($result < 0)
-        	{
-        		setEventMessages($object->error, $object->errors, 'errors');
-        		$error++;
-        	}
-        }
+		if (!$error)
+		{
+			$result = $object->insertExtraFields('COMPANY_MODIFY');
+			if ($result < 0)
+			{
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
 
-        if ($error) $action = 'edit_extras';
-    }
+		if ($error) $action = 'edit_extras';
+	}
 
-    // Add new or update third party
-    if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
-    && ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
-    {
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	// Add new or update third party
+	if ((!GETPOST('getcustomercode') && !GETPOST('getsuppliercode'))
+	&& ($action == 'add' || $action == 'update') && $user->rights->societe->creer)
+	{
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-        if (!GETPOST('name'))
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
-            $error++;
-        }
-        if (GETPOST('client') < 0)
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
-            $error++;
-        }
-        if (GETPOST('fournisseur') < 0)
-        {
-            setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
-            $error++;
-        }
+		if (!GETPOST('name'))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
+			$error++;
+		}
+		if (GETPOST('client') < 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
+			$error++;
+		}
+		if (GETPOST('fournisseur') < 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-        	if ($action == 'update')
-	        {
-	        	$ret = $object->fetch($socid);
+		if (!$error)
+		{
+			if ($action == 'update')
+			{
+				$ret = $object->fetch($socid);
 				$object->oldcopy = clone $object;
-	        } else $object->canvas = $canvas;
+			} else $object->canvas = $canvas;
 
-	        if (GETPOST("private", 'int') == 1)	// Ask to create a contact
-	        {
-	            $object->particulier		= GETPOST("private", 'int');
+			if (GETPOST("private", 'int') == 1)	// Ask to create a contact
+			{
+				$object->particulier		= GETPOST("private", 'int');
 
-	            $object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
-	            $object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
-	            // Add non official properties
-	            $object->name_bis = GETPOST('name', 'alphanohtml');
-	            $object->firstname = GETPOST('firstname', 'alphanohtml');
-	        } else {
-	            $object->name = GETPOST('name', 'alphanohtml');
-	        }
-	        $object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
-	        $object->name_alias = GETPOST('name_alias', 'alphanohtml');
-	        $object->address				= GETPOST('address', 'alphanohtml');
-	        $object->zip = GETPOST('zipcode', 'alphanohtml');
-	        $object->town = GETPOST('town', 'alphanohtml');
-	        $object->country_id = GETPOST('country_id', 'int');
-	        $object->state_id = GETPOST('state_id', 'int');
-	        //$object->skype					= GETPOST('skype', 'alpha');
-	        //$object->twitter				= GETPOST('twitter', 'alpha');
-	        //$object->facebook				= GETPOST('facebook', 'alpha');
-            //$object->linkedin				= GETPOST('linkedin', 'alpha');
-            $object->socialnetworks = array();
-            if (!empty($conf->socialnetworks->enabled)) {
-                foreach ($socialnetworks as $key => $value) {
-                    if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                        $object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
-                    }
-                }
-            }
-            $object->phone = GETPOST('phone', 'alpha');
-	        $object->fax					= GETPOST('fax', 'alpha');
-	        $object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
-	        $object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
-	        $object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
-	        $object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
-	        $object->idprof3				= trim(GETPOST('idprof3', 'alphanohtml'));
-	        $object->idprof4				= trim(GETPOST('idprof4', 'alphanohtml'));
-	        $object->idprof5				= trim(GETPOST('idprof5', 'alphanohtml'));
-	        $object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
-	        $object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
-	        $object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
-	        $object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
-	        $object->capital				= GETPOST('capital', 'alphanohtml');
-	        $object->barcode				= GETPOST('barcode', 'alphanohtml');
+				$object->name = dolGetFirstLastname(GETPOST('firstname', 'alphanohtml'), GETPOST('name', 'alphanohtml'));
+				$object->civility_id		= GETPOST('civility_id', 'alphanohtml'); // Note: civility id is a code, not an int
+				// Add non official properties
+				$object->name_bis = GETPOST('name', 'alphanohtml');
+				$object->firstname = GETPOST('firstname', 'alphanohtml');
+			} else {
+				$object->name = GETPOST('name', 'alphanohtml');
+			}
+			$object->entity					= (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : $conf->entity);
+			$object->name_alias = GETPOST('name_alias', 'alphanohtml');
+			$object->address				= GETPOST('address', 'alphanohtml');
+			$object->zip = GETPOST('zipcode', 'alphanohtml');
+			$object->town = GETPOST('town', 'alphanohtml');
+			$object->country_id = GETPOST('country_id', 'int');
+			$object->state_id = GETPOST('state_id', 'int');
+			//$object->skype					= GETPOST('skype', 'alpha');
+			//$object->twitter				= GETPOST('twitter', 'alpha');
+			//$object->facebook				= GETPOST('facebook', 'alpha');
+			//$object->linkedin				= GETPOST('linkedin', 'alpha');
+			$object->socialnetworks = array();
+			if (!empty($conf->socialnetworks->enabled)) {
+				foreach ($socialnetworks as $key => $value) {
+					if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
+						$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+					}
+				}
+			}
+			$object->phone = GETPOST('phone', 'alpha');
+			$object->fax					= GETPOST('fax', 'alpha');
+			$object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
+			$object->url					= trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
+			$object->idprof1				= trim(GETPOST('idprof1', 'alphanohtml'));
+			$object->idprof2				= trim(GETPOST('idprof2', 'alphanohtml'));
+			$object->idprof3				= trim(GETPOST('idprof3', 'alphanohtml'));
+			$object->idprof4				= trim(GETPOST('idprof4', 'alphanohtml'));
+			$object->idprof5				= trim(GETPOST('idprof5', 'alphanohtml'));
+			$object->idprof6				= trim(GETPOST('idprof6', 'alphanohtml'));
+			$object->prefix_comm			= GETPOST('prefix_comm', 'alphanohtml');
+			$object->code_client			= GETPOSTISSET('customer_code') ?GETPOST('customer_code', 'alpha') : GETPOST('code_client', 'alpha');
+			$object->code_fournisseur = GETPOSTISSET('supplier_code') ?GETPOST('supplier_code', 'alpha') : GETPOST('code_fournisseur', 'alpha');
+			$object->capital				= GETPOST('capital', 'alphanohtml');
+			$object->barcode				= GETPOST('barcode', 'alphanohtml');
 
-	        $object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
-	        $object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
-	        $object->status = GETPOST('status', 'alpha');
+			$object->tva_intra				= GETPOST('tva_intra', 'alphanohtml');
+			$object->tva_assuj				= GETPOST('assujtva_value', 'alpha');
+			$object->status = GETPOST('status', 'alpha');
 
-	        // Local Taxes
-	        $object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
-	        $object->localtax2_assuj		= GETPOST('localtax2assuj_value', 'alpha');
+			// Local Taxes
+			$object->localtax1_assuj		= GETPOST('localtax1assuj_value', 'alpha');
+			$object->localtax2_assuj		= GETPOST('localtax2assuj_value', 'alpha');
 
-	        $object->localtax1_value		= GETPOST('lt1', 'alpha');
-	        $object->localtax2_value		= GETPOST('lt2', 'alpha');
+			$object->localtax1_value		= GETPOST('lt1', 'alpha');
+			$object->localtax2_value		= GETPOST('lt2', 'alpha');
 
-	        $object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
-	        $object->effectif_id			= GETPOST('effectif_id', 'int');
-	        $object->typent_id = GETPOST('typent_id', 'int');
+			$object->forme_juridique_code = GETPOST('forme_juridique_code', 'int');
+			$object->effectif_id			= GETPOST('effectif_id', 'int');
+			$object->typent_id = GETPOST('typent_id', 'int');
 
-	        $object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
+			$object->typent_code			= dol_getIdFromCode($db, $object->typent_id, 'c_typent', 'id', 'code'); // Force typent_code too so check in verify() will be done on new type
 
-	        $object->client = GETPOST('client', 'int');
-	        $object->fournisseur			= GETPOST('fournisseur', 'int');
+			$object->client = GETPOST('client', 'int');
+			$object->fournisseur			= GETPOST('fournisseur', 'int');
 
-	        $object->commercial_id = GETPOST('commercial_id', 'int');
-	        $object->default_lang = GETPOST('default_lang');
+			$object->commercial_id = GETPOST('commercial_id', 'int');
+			$object->default_lang = GETPOST('default_lang');
 
-	        // Webservices url/key
-	        $object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
-	        $object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
+			// Webservices url/key
+			$object->webservices_url		= GETPOST('webservices_url', 'custom', 0, FILTER_SANITIZE_URL);
+			$object->webservices_key		= GETPOST('webservices_key', 'san_alpha');
 
 			// Incoterms
 			if (!empty($conf->incoterm->enabled))
@@ -475,8 +479,8 @@ if (empty($reshook))
 				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
 			}
 
-	        // Fill array 'array_options' with data from add form
-	        $ret = $extrafields->setOptionalsFromPost(null, $object);
+			// Fill array 'array_options' with data from add form
+			$ret = $extrafields->setOptionalsFromPost(null, $object);
 			if ($ret < 0)
 			{
 				 $error++;
@@ -490,58 +494,58 @@ if (empty($reshook))
 			}
 			//var_dump($object->array_languages);exit;
 
-	        if (GETPOST('deletephoto')) $object->logo = '';
-	        elseif (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
+			if (GETPOST('deletephoto')) $object->logo = '';
+			elseif (!empty($_FILES['photo']['name'])) $object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
 
-	        // Check parameters
-	        if (!GETPOST('cancel', 'alpha'))
-	        {
-	            if (!empty($object->email) && !isValidEMail($object->email))
-	            {
-	                $langs->load("errors");
-	                $error++;
-	                setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
-	            }
-	            if (!empty($object->url) && !isValidUrl($object->url))
-	            {
-	                $langs->load("errors");
-	                setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
-	            }
-	            if (!empty($object->webservices_url)) {
-	                //Check if has transport, without any the soap client will give error
-	                if (strpos($object->webservices_url, "http") === false)
-	                {
-	                    $object->webservices_url = "http://".$object->webservices_url;
-	                }
-	                if (!isValidUrl($object->webservices_url)) {
-	                    $langs->load("errors");
-	                    $error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
-	                }
-	            }
+			// Check parameters
+			if (!GETPOST('cancel', 'alpha'))
+			{
+				if (!empty($object->email) && !isValidEMail($object->email))
+				{
+					$langs->load("errors");
+					$error++;
+					setEventMessages('', $langs->trans("ErrorBadEMail", $object->email), 'errors');
+				}
+				if (!empty($object->url) && !isValidUrl($object->url))
+				{
+					$langs->load("errors");
+					setEventMessages('', $langs->trans("ErrorBadUrl", $object->url), 'errors');
+				}
+				if (!empty($object->webservices_url)) {
+					//Check if has transport, without any the soap client will give error
+					if (strpos($object->webservices_url, "http") === false)
+					{
+						$object->webservices_url = "http://".$object->webservices_url;
+					}
+					if (!isValidUrl($object->webservices_url)) {
+						$langs->load("errors");
+						$error++; $errors[] = $langs->trans("ErrorBadUrl", $object->webservices_url);
+					}
+				}
 
-	            // We set country_id, country_code and country for the selected country
-	            $object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
-	            if ($object->country_id)
-	            {
-	            	$tmparray = getCountry($object->country_id, 'all');
-	            	$object->country_code = $tmparray['code'];
-	            	$object->country = $tmparray['label'];
-	            }
-	        }
-        }
+				// We set country_id, country_code and country for the selected country
+				$object->country_id = GETPOST('country_id') != '' ?GETPOST('country_id') : $mysoc->country_id;
+				if ($object->country_id)
+				{
+					$tmparray = getCountry($object->country_id, 'all');
+					$object->country_code = $tmparray['code'];
+					$object->country = $tmparray['label'];
+				}
+			}
+		}
 
-        if (!$error)
-        {
-            if ($action == 'add')
-            {
-            	$error = 0;
+		if (!$error)
+		{
+			if ($action == 'add')
+			{
+				$error = 0;
 
-                $db->begin();
+				$db->begin();
 
-                if (empty($object->client))      $object->code_client = '';
-                if (empty($object->fournisseur)) $object->code_fournisseur = '';
+				if (empty($object->client))      $object->code_client = '';
+				if (empty($object->fournisseur)) $object->code_fournisseur = '';
 
-                $result = $object->create($user);
+				$result = $object->create($user);
 
 				if ($result >= 0)
 				{
@@ -583,106 +587,106 @@ if (empty($reshook))
 						setEventMessages($object->error, $object->errors, 'errors');
 					}
 
-                    // Logo/Photo save
-                    $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
-                    $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-                    if ($file_OK)
-                    {
-                        if (image_format_supported($_FILES['photo']['name']))
-                        {
-                            dol_mkdir($dir);
+					// Logo/Photo save
+					$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos/";
+					$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+					if ($file_OK)
+					{
+						if (image_format_supported($_FILES['photo']['name']))
+						{
+							dol_mkdir($dir);
 
-                            if (@is_dir($dir))
-                            {
-                                $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                                $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+							if (@is_dir($dir))
+							{
+								$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+								$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                                if (!$result > 0)
-                                {
-                                    $errors[] = "ErrorFailedToSaveFile";
-                                } else {
-                                    // Create thumbs
-                                    $object->addThumbs($newfile);
-                                }
-                            }
-                        }
-                    } else {
+								if (!$result > 0)
+								{
+									$errors[] = "ErrorFailedToSaveFile";
+								} else {
+									// Create thumbs
+									$object->addThumbs($newfile);
+								}
+							}
+						}
+					} else {
 						switch ($_FILES['photo']['error'])
 						{
-						    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-						    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-						        $errors[] = "ErrorFileSizeTooLarge";
-						        break;
-	      					case 3: //uploaded file was only partially uploaded
-						        $errors[] = "ErrorFilePartiallyUploaded";
-						        break;
+							case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+							case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+								$errors[] = "ErrorFileSizeTooLarge";
+								break;
+		  					case 3: //uploaded file was only partially uploaded
+								$errors[] = "ErrorFilePartiallyUploaded";
+								break;
 						}
-	                }
-                    // Gestion du logo de la société
-                } else {
-				    if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
+					}
+					// Gestion du logo de la société
+				} else {
+					if ($db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') // TODO Sometime errors on duplicate on profid and not on code, so we must manage this case
 					{
 						$duplicate_code_error = true;
 						$object->code_fournisseur = null;
 						$object->code_client = null;
 					}
 
-                    setEventMessages($object->error, $object->errors, 'errors');
-                   	$error++;
-                }
+					setEventMessages($object->error, $object->errors, 'errors');
+				   	$error++;
+				}
 
-                if ($result >= 0 && !$error)
-                {
-                    $db->commit();
+				if ($result >= 0 && !$error)
+				{
+					$db->commit();
 
-                    if (!empty($backtopage))
-                	{
-                		$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
-                		if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	} else {
-                		$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
-                    	if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
-                    	elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
+					if (!empty($backtopage))
+					{
+						$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+						if (preg_match('/\?/', $backtopage)) $backtopage .= '&socid='.$object->id; // Old method
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+						$url = $_SERVER["PHP_SELF"]."?socid=".$object->id; // Old method
+						if (($object->client == 1 || $object->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) $url = DOL_URL_ROOT."/comm/card.php?socid=".$object->id;
+						elseif ($object->fournisseur == 1) $url = DOL_URL_ROOT."/fourn/card.php?socid=".$object->id;
 
-                		header("Location: ".$url);
-                    	exit;
-                	}
-                } else {
-                    $db->rollback();
-                    $action = 'create';
-                }
-            }
+						header("Location: ".$url);
+						exit;
+					}
+				} else {
+					$db->rollback();
+					$action = 'create';
+				}
+			}
 
-            if ($action == 'update')
-            {
-            	$error = 0;
+			if ($action == 'update')
+			{
+				$error = 0;
 
-                if (GETPOST('cancel', 'alpha'))
-                {
-                	if (!empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	} else {
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
-                }
+				if (GETPOST('cancel', 'alpha'))
+				{
+					if (!empty($backtopage))
+					{
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						exit;
+					}
+				}
 
-                // To not set code if third party is not concerned. But if it had values, we keep them.
-                if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client = '';
-                if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur = '';
-                //var_dump($object);exit;
+				// To not set code if third party is not concerned. But if it had values, we keep them.
+				if (empty($object->client) && empty($object->oldcopy->code_client))          $object->code_client = '';
+				if (empty($object->fournisseur) && empty($object->oldcopy->code_fournisseur)) $object->code_fournisseur = '';
+				//var_dump($object);exit;
 
-                $result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
+				$result = $object->update($socid, $user, 1, $object->oldcopy->codeclient_modifiable(), $object->oldcopy->codefournisseur_modifiable(), 'update', 0);
 
-                if ($result <= 0)
-                {
-                    setEventMessages($object->error, $object->errors, 'errors');
-                    $error++;
-                }
+				if ($result <= 0)
+				{
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
 
 				// Links with users
 				$salesreps = GETPOST('commercial', 'array');
@@ -715,128 +719,128 @@ if (empty($reshook))
 					}
 				}
 
-                // Logo/Photo save
-                $dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
-                $file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
-                if (GETPOST('deletephoto') && $object->logo)
-                {
-                    $fileimg = $dir.'/'.$object->logo;
-                    $dirthumbs = $dir.'/thumbs';
-                    dol_delete_file($fileimg);
-                    dol_delete_dir_recursive($dirthumbs);
-                }
-                if ($file_OK)
-                {
-                    if (image_format_supported($_FILES['photo']['name']) > 0)
-                    {
-                        dol_mkdir($dir);
+				// Logo/Photo save
+				$dir     = $conf->societe->multidir_output[$object->entity]."/".$object->id."/logos";
+				$file_OK = is_uploaded_file($_FILES['photo']['tmp_name']);
+				if (GETPOST('deletephoto') && $object->logo)
+				{
+					$fileimg = $dir.'/'.$object->logo;
+					$dirthumbs = $dir.'/thumbs';
+					dol_delete_file($fileimg);
+					dol_delete_dir_recursive($dirthumbs);
+				}
+				if ($file_OK)
+				{
+					if (image_format_supported($_FILES['photo']['name']) > 0)
+					{
+						dol_mkdir($dir);
 
-                        if (@is_dir($dir))
-                        {
-                            $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                            $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+						if (@is_dir($dir))
+						{
+							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+							$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                            if (!$result > 0)
-                            {
-                                $errors[] = "ErrorFailedToSaveFile";
-                            } else {
-                            	// Create thumbs
-                            	$object->addThumbs($newfile);
+							if (!$result > 0)
+							{
+								$errors[] = "ErrorFailedToSaveFile";
+							} else {
+								// Create thumbs
+								$object->addThumbs($newfile);
 
-                                // Index file in database
-                                if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
-                                {
-                                	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-                                	// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
-                                	deleteFilesIntoDatabaseIndex(dirname($newfile), '', '');
-                                	// now we index the uploaded logo file
-                                	addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
-                                }
-                            }
-                        }
-                    } else {
-                        $errors[] = "ErrorBadImageFormat";
-                    }
-                } else {
+								// Index file in database
+								if (!empty($conf->global->THIRDPARTY_LOGO_ALLOW_EXTERNAL_DOWNLOAD))
+								{
+									require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+									// the dir dirname($newfile) is directory of logo, so we should have only one file at once into index, so we delete indexes for the dir
+									deleteFilesIntoDatabaseIndex(dirname($newfile), '', '');
+									// now we index the uploaded logo file
+									addFileIntoDatabaseIndex(dirname($newfile), basename($newfile), '', 'uploaded', 1);
+								}
+							}
+						}
+					} else {
+						$errors[] = "ErrorBadImageFormat";
+					}
+				} else {
 					switch ($_FILES['photo']['error'])
 					{
-					    case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
-					    case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
-					        $errors[] = "ErrorFileSizeTooLarge";
-					        break;
-      					case 3: //uploaded file was only partially uploaded
-					        $errors[] = "ErrorFilePartiallyUploaded";
-					        break;
+						case 1: //uploaded file exceeds the upload_max_filesize directive in php.ini
+						case 2: //uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the html form
+							$errors[] = "ErrorFileSizeTooLarge";
+							break;
+	  					case 3: //uploaded file was only partially uploaded
+							$errors[] = "ErrorFilePartiallyUploaded";
+							break;
 					}
-                }
-                // Gestion du logo de la société
+				}
+				// Gestion du logo de la société
 
 
-                // Update linked member
-                if (!$error && $object->fk_soc > 0)
-                {
-                	$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
-                	$sql .= " SET fk_soc = NULL WHERE fk_soc = ".$id;
-                	if (!$object->db->query($sql))
-                	{
-                		$error++;
-                		$object->error .= $object->db->lasterror();
-                		setEventMessages($object->error, $object->errors, 'errors');
-                	}
-                }
+				// Update linked member
+				if (!$error && $object->fk_soc > 0)
+				{
+					$sql = "UPDATE ".MAIN_DB_PREFIX."adherent";
+					$sql .= " SET fk_soc = NULL WHERE fk_soc = ".$id;
+					if (!$object->db->query($sql))
+					{
+						$error++;
+						$object->error .= $object->db->lasterror();
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
 
-                if (!$error && !count($errors))
-                {
-                	if (!empty($backtopage))
-                	{
-               		    header("Location: ".$backtopage);
-                    	exit;
-                	} else {
-               		    header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
-                    	exit;
-                	}
-                } else {
-                    $object->id = $socid;
-                    $action = "edit";
-                }
-            }
-        } else {
-        	$action = ($action == 'add' ? 'create' : 'edit');
-        }
-    }
+				if (!$error && !count($errors))
+				{
+					if (!empty($backtopage))
+					{
+			   			header("Location: ".$backtopage);
+						exit;
+					} else {
+			   			header("Location: ".$_SERVER["PHP_SELF"]."?socid=".$socid);
+						exit;
+					}
+				} else {
+					$object->id = $socid;
+					$action = "edit";
+				}
+			}
+		} else {
+			$action = ($action == 'add' ? 'create' : 'edit');
+		}
+	}
 
-    // Delete third party
-    if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
-    {
-        $object->fetch($socid);
-        $object->oldcopy = clone $object;
-        $result = $object->delete($socid, $user);
+	// Delete third party
+	if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->societe->supprimer)
+	{
+		$object->fetch($socid);
+		$object->oldcopy = clone $object;
+		$result = $object->delete($socid, $user);
 
-        if ($result > 0)
-        {
-            header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
-            exit;
-        } else {
-            $langs->load("errors");
-           	setEventMessages($object->error, $object->errors, 'errors');
-           	$error++;
-            $action = '';
-        }
-    }
+		if ($result > 0)
+		{
+			header("Location: ".DOL_URL_ROOT."/societe/list.php?restore_lastsearch_values=1&delsoc=".urlencode($object->name));
+			exit;
+		} else {
+			$langs->load("errors");
+		   	setEventMessages($object->error, $object->errors, 'errors');
+		   	$error++;
+			$action = '';
+		}
+	}
 
-    // Set parent company
-    if ($action == 'set_thirdparty' && $user->rights->societe->creer)
-    {
-    	$object->fetch($socid);
-    	$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
-    }
+	// Set parent company
+	if ($action == 'set_thirdparty' && $user->rights->societe->creer)
+	{
+		$object->fetch($socid);
+		$result = $object->set_parent(GETPOST('editparentcompany', 'int'));
+	}
 
-    // Set incoterm
-    if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
-    {
-    	$object->fetch($socid);
-    	$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
-    }
+	// Set incoterm
+	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled))
+	{
+		$object->fetch($socid);
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	}
 
 	// Set sales representatives
 	if ($action == 'set_salesrepresentatives' && $user->rights->societe->creer)
@@ -845,26 +849,26 @@ if (empty($reshook))
 		$result = $object->setSalesRep(GETPOST('commercial', 'array'));
 	}
 
-    $id = $socid;
-    $object->fetch($socid);
+	$id = $socid;
+	$object->fetch($socid);
 
 	// Selection of new fields
 	if (!empty($conf->global->MAIN_DUPLICATE_CONTACTS_TAB_ON_MAIN_CARD) && (empty($conf->global->SOCIETE_DISABLE_CONTACTS) || !empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT))) {
 		include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 	}
 
-    // Actions to send emails
-    $triggersendname = 'COMPANY_SENTBYMAIL';
-    $paramname = 'socid';
-    $mode = 'emailfromthirdparty';
-    $trackid = 'thi'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'COMPANY_SENTBYMAIL';
+	$paramname = 'socid';
+	$mode = 'emailfromthirdparty';
+	$trackid = 'thi'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-    // Actions to build doc
-    $id = $socid;
-    $upload_dir = $conf->societe->dir_output;
-    $permissiontoadd = $user->rights->societe->creer;
-    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+	// Actions to build doc
+	$id = $socid;
+	$upload_dir = $conf->societe->dir_output;
+	$permissiontoadd = $user->rights->societe->creer;
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
 
@@ -879,7 +883,7 @@ $formcompany = new FormCompany($db);
 
 if ($socid > 0 && empty($object->id))
 {
-    $result = $object->fetch($socid);
+	$result = $object->fetch($socid);
 	if ($result <= 0) dol_print_error('', $object->error);
 }
 
@@ -892,173 +896,173 @@ $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("
 
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 {
-    // -----------------------------------------
-    // When used with CANVAS
-    // -----------------------------------------
+	// -----------------------------------------
+	// When used with CANVAS
+	// -----------------------------------------
    	$objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates
-    $objcanvas->display_canvas($action); // Show template
+	$objcanvas->display_canvas($action); // Show template
 } else {
-    // -----------------------------------------
-    // When used in standard mode
-    // -----------------------------------------
-    if ($action == 'create')
-    {
-        /*
+	// -----------------------------------------
+	// When used in standard mode
+	// -----------------------------------------
+	if ($action == 'create')
+	{
+		/*
          *  Creation
          */
 		$private = GETPOST("private", "int");
 		if (!empty($conf->global->THIRDPARTY_DEFAULT_CREATE_CONTACT) && !GETPOSTISSET('private')) $private = 1;
-    	if (empty($private)) $private = 0;
+		if (empty($private)) $private = 0;
 
-        // Load object modCodeTiers
-        $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module) - 4);
-        }
-        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-        foreach ($dirsociete as $dirroot)
-        {
-            $res = dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
-        }
-        $modCodeClient = new $module;
-        // Load object modCodeFournisseur
-        $module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
-        if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
-        {
-            $module = substr($module, 0, dol_strlen($module) - 4);
-        }
-        $dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
-        foreach ($dirsociete as $dirroot)
-        {
-            $res = dol_include_once($dirroot.$module.'.php');
-            if ($res) break;
-        }
-        $modCodeFournisseur = new $module;
+		// Load object modCodeTiers
+		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module) - 4);
+		}
+		$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+		foreach ($dirsociete as $dirroot)
+		{
+			$res = dol_include_once($dirroot.$module.'.php');
+			if ($res) break;
+		}
+		$modCodeClient = new $module;
+		// Load object modCodeFournisseur
+		$module = (!empty($conf->global->SOCIETE_CODECLIENT_ADDON) ? $conf->global->SOCIETE_CODECLIENT_ADDON : 'mod_codeclient_leopard');
+		if (substr($module, 0, 15) == 'mod_codeclient_' && substr($module, -3) == 'php')
+		{
+			$module = substr($module, 0, dol_strlen($module) - 4);
+		}
+		$dirsociete = array_merge(array('/core/modules/societe/'), $conf->modules_parts['societe']);
+		foreach ($dirsociete as $dirroot)
+		{
+			$res = dol_include_once($dirroot.$module.'.php');
+			if ($res) break;
+		}
+		$modCodeFournisseur = new $module;
 
-        // Define if customer/prospect or supplier status is set or not
-        if (GETPOST("type") != 'f')
-        {
-            $object->client = -1;
-            if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) { $object->client = 3; }
-        }
-        // Prospect / Customer
-        if (GETPOST("type") == 'c') {
-        	if (!empty($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT)) {
-        		$object->client = $conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT;
-        	} else {
-        		$object->client = 3;
-        	}
-        }
-        if (GETPOST("type") == 'p') { $object->client = 2; }
-        if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
+		// Define if customer/prospect or supplier status is set or not
+		if (GETPOST("type") != 'f')
+		{
+			$object->client = -1;
+			if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) { $object->client = 3; }
+		}
+		// Prospect / Customer
+		if (GETPOST("type") == 'c') {
+			if (!empty($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT)) {
+				$object->client = $conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT;
+			} else {
+				$object->client = 3;
+			}
+		}
+		if (GETPOST("type") == 'p') { $object->client = 2; }
+		if (!empty($conf->fournisseur->enabled) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) { $object->fournisseur = 1; }
 
-        $object->name = GETPOST('name', 'alphanohtml');
-        $object->name_alias	= GETPOST('name_alias', 'alphanohtml');
-        $object->firstname = GETPOST('firstname', 'alphanohtml');
-        $object->particulier		= $private;
-        $object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
-        $object->client = GETPOST('client', 'int') ?GETPOST('client', 'int') : $object->client;
+		$object->name = GETPOST('name', 'alphanohtml');
+		$object->name_alias	= GETPOST('name_alias', 'alphanohtml');
+		$object->firstname = GETPOST('firstname', 'alphanohtml');
+		$object->particulier		= $private;
+		$object->prefix_comm		= GETPOST('prefix_comm', 'alphanohtml');
+		$object->client = GETPOST('client', 'int') ?GETPOST('client', 'int') : $object->client;
 
-        if (empty($duplicate_code_error)) {
-	        $object->code_client		= GETPOST('customer_code', 'alpha');
-	        $object->fournisseur		= GETPOST('fournisseur') ? GETPOST('fournisseur', 'int') : $object->fournisseur;
-            $object->code_fournisseur = GETPOST('supplier_code', 'alpha');
-        } else {
+		if (empty($duplicate_code_error)) {
+			$object->code_client		= GETPOST('customer_code', 'alpha');
+			$object->fournisseur		= GETPOST('fournisseur') ? GETPOST('fournisseur', 'int') : $object->fournisseur;
+			$object->code_fournisseur = GETPOST('supplier_code', 'alpha');
+		} else {
 			setEventMessages($langs->trans('NewCustomerSupplierCodeProposed'), '', 'warnings');
 		}
 
 
-        $object->address = GETPOST('address', 'alphanohtml');
-        $object->zip = GETPOST('zipcode', 'alphanohtml');
-        $object->town = GETPOST('town', 'alphanohtml');
-        $object->state_id = GETPOST('state_id', 'int');
-        //$object->skype				= GETPOST('skype', 'alpha');
-        //$object->twitter			= GETPOST('twitter', 'alpha');
-        //$object->facebook			= GETPOST('facebook', 'alpha');
-        //$object->linkedin			= GETPOST('linkedin', 'alpha');
-        $object->socialnetworks = array();
-        if (!empty($conf->socialnetworks->enabled)) {
-            foreach ($socialnetworks as $key => $value) {
-                if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
-                    $object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
-                }
-            }
-        }
-        $object->phone				= GETPOST('phone', 'alpha');
-        $object->fax				= GETPOST('fax', 'alpha');
-        $object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
-        $object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
-        $object->capital			= GETPOST('capital', 'alphanohtml');
-        $object->barcode			= GETPOST('barcode', 'alphanohtml');
-        $object->idprof1			= GETPOST('idprof1', 'alphanohtml');
-        $object->idprof2			= GETPOST('idprof2', 'alphanohtml');
-        $object->idprof3			= GETPOST('idprof3', 'alphanohtml');
-        $object->idprof4			= GETPOST('idprof4', 'alphanohtml');
-        $object->idprof5			= GETPOST('idprof5', 'alphanohtml');
-        $object->idprof6			= GETPOST('idprof6', 'alphanohtml');
-        $object->typent_id = GETPOST('typent_id', 'int');
-        $object->effectif_id		= GETPOST('effectif_id', 'int');
-        $object->civility_id		= GETPOST('civility_id', 'alpha');
+		$object->address = GETPOST('address', 'alphanohtml');
+		$object->zip = GETPOST('zipcode', 'alphanohtml');
+		$object->town = GETPOST('town', 'alphanohtml');
+		$object->state_id = GETPOST('state_id', 'int');
+		//$object->skype				= GETPOST('skype', 'alpha');
+		//$object->twitter			= GETPOST('twitter', 'alpha');
+		//$object->facebook			= GETPOST('facebook', 'alpha');
+		//$object->linkedin			= GETPOST('linkedin', 'alpha');
+		$object->socialnetworks = array();
+		if (!empty($conf->socialnetworks->enabled)) {
+			foreach ($socialnetworks as $key => $value) {
+				if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
+					$object->socialnetworks[$key] = GETPOST($key, 'alphanohtml');
+				}
+			}
+		}
+		$object->phone				= GETPOST('phone', 'alpha');
+		$object->fax				= GETPOST('fax', 'alpha');
+		$object->email				= GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
+		$object->url				= GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
+		$object->capital			= GETPOST('capital', 'alphanohtml');
+		$object->barcode			= GETPOST('barcode', 'alphanohtml');
+		$object->idprof1			= GETPOST('idprof1', 'alphanohtml');
+		$object->idprof2			= GETPOST('idprof2', 'alphanohtml');
+		$object->idprof3			= GETPOST('idprof3', 'alphanohtml');
+		$object->idprof4			= GETPOST('idprof4', 'alphanohtml');
+		$object->idprof5			= GETPOST('idprof5', 'alphanohtml');
+		$object->idprof6			= GETPOST('idprof6', 'alphanohtml');
+		$object->typent_id = GETPOST('typent_id', 'int');
+		$object->effectif_id		= GETPOST('effectif_id', 'int');
+		$object->civility_id		= GETPOST('civility_id', 'alpha');
 
-        $object->tva_assuj = GETPOST('assujtva_value', 'int');
-        $object->status = GETPOST('status', 'int');
+		$object->tva_assuj = GETPOST('assujtva_value', 'int');
+		$object->status = GETPOST('status', 'int');
 
-        //Local Taxes
-        $object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
-        $object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
+		//Local Taxes
+		$object->localtax1_assuj	= GETPOST('localtax1assuj_value', 'int');
+		$object->localtax2_assuj	= GETPOST('localtax2assuj_value', 'int');
 
-        $object->localtax1_value	= GETPOST('lt1', 'int');
-        $object->localtax2_value	= GETPOST('lt2', 'int');
+		$object->localtax1_value	= GETPOST('lt1', 'int');
+		$object->localtax2_value	= GETPOST('lt2', 'int');
 
-        $object->tva_intra = GETPOST('tva_intra', 'alphanohtml');
+		$object->tva_intra = GETPOST('tva_intra', 'alphanohtml');
 
-        $object->commercial_id = GETPOST('commercial_id', 'int');
-        $object->default_lang = GETPOST('default_lang');
+		$object->commercial_id = GETPOST('commercial_id', 'int');
+		$object->default_lang = GETPOST('default_lang');
 
-        $object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
+		$object->logo = (isset($_FILES['photo']) ?dol_sanitizeFileName($_FILES['photo']['name']) : '');
 
-        // Gestion du logo de la société
-        $dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
-        $file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
-        if ($file_OK)
-        {
-            if (image_format_supported($_FILES['photo']['name']))
-            {
-                dol_mkdir($dir);
+		// Gestion du logo de la société
+		$dir     = $conf->societe->multidir_output[$conf->entity]."/".$object->id."/logos";
+		$file_OK = (isset($_FILES['photo']) ?is_uploaded_file($_FILES['photo']['tmp_name']) : false);
+		if ($file_OK)
+		{
+			if (image_format_supported($_FILES['photo']['name']))
+			{
+				dol_mkdir($dir);
 
-                if (@is_dir($dir))
-                {
-                    $newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
-                    $result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
+				if (@is_dir($dir))
+				{
+					$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
+					$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-                    if (!$result > 0)
-                    {
-                        $errors[] = "ErrorFailedToSaveFile";
-                    } else {
-                        // Create thumbs
-                        $object->addThumbs($newfile);
-                    }
-                }
-            }
-        }
+					if (!$result > 0)
+					{
+						$errors[] = "ErrorFailedToSaveFile";
+					} else {
+						// Create thumbs
+						$object->addThumbs($newfile);
+					}
+				}
+			}
+		}
 
-        // We set country_id, country_code and country for the selected country
-        $object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
-        if ($object->country_id)
-        {
-            $tmparray = getCountry($object->country_id, 'all');
-            $object->country_code = $tmparray['code'];
-            $object->country = $tmparray['label'];
-        }
-        $object->forme_juridique_code = GETPOST('forme_juridique_code');
-        /* Show create form */
+		// We set country_id, country_code and country for the selected country
+		$object->country_id = GETPOST('country_id') ?GETPOST('country_id') : $mysoc->country_id;
+		if ($object->country_id)
+		{
+			$tmparray = getCountry($object->country_id, 'all');
+			$object->country_code = $tmparray['code'];
+			$object->country = $tmparray['label'];
+		}
+		$object->forme_juridique_code = GETPOST('forme_juridique_code');
+		/* Show create form */
 
-        $linkback = "";
-        print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'building');
+		$linkback = "";
+		print load_fiche_titre($langs->trans("NewThirdParty"), $linkback, 'building');
 
-        if (!empty($conf->use_javascript_ajax)) {
+		if (!empty($conf->use_javascript_ajax)) {
 			if (!empty($conf->global->THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION)) {
 				print "\n".'<script type="text/javascript">';
 				print '$(document).ready(function () {
@@ -1431,14 +1435,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
             print '</td></tr>';
         }
 
-        // Type - Size
+        // Type - Workforce/Staff
         print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>'."\n";
         $sortparam = (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT); // NONE means we keep sort of original array, so we sort on position. ASC, means next function will sort on label.
         print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, $sortparam);
         if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td>';
         if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
+        print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone"'.($conf->browser->layout == 'phone' ? ' colspan="3"': '').'>';
         print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
         if ($user->admin) print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
         print '</td></tr>';
@@ -1655,33 +1659,33 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 					$object->location_incoterms = GETPOST('lcoation_incoterms', 'alpha');
 				}
 
-                //Local Taxes
-                $object->localtax1_assuj		= GETPOST('localtax1assuj_value');
-                $object->localtax2_assuj		= GETPOST('localtax2assuj_value');
+				//Local Taxes
+				$object->localtax1_assuj		= GETPOST('localtax1assuj_value');
+				$object->localtax2_assuj		= GETPOST('localtax2assuj_value');
 
-                $object->localtax1_value		= GETPOST('lt1');
-                $object->localtax2_value		= GETPOST('lt2');
+				$object->localtax1_value		= GETPOST('lt1');
+				$object->localtax2_value		= GETPOST('lt2');
 
-                // We set country_id, and country_code label of the chosen country
-                if ($object->country_id > 0)
-                {
-                	$tmparray = getCountry($object->country_id, 'all');
-                    $object->country_code = $tmparray['code'];
-                    $object->country = $tmparray['label'];
-                }
-            }
+				// We set country_id, and country_code label of the chosen country
+				if ($object->country_id > 0)
+				{
+					$tmparray = getCountry($object->country_id, 'all');
+					$object->country_code = $tmparray['code'];
+					$object->country = $tmparray['label'];
+				}
+			}
 
-            if ($object->localtax1_assuj == 0) {
-            	$sub = 0;
-            } else {$sub = 1; }
-            if ($object->localtax2_assuj == 0) {
-            	$sub2 = 0;
-            } else {$sub2 = 1; }
+			if ($object->localtax1_assuj == 0) {
+				$sub = 0;
+			} else {$sub = 1; }
+			if ($object->localtax2_assuj == 0) {
+				$sub2 = 0;
+			} else {$sub2 = 1; }
 
-            if ($conf->use_javascript_ajax)
-            {
-            	print "\n".'<script type="text/javascript">';
-            	print '$(document).ready(function () {
+			if ($conf->use_javascript_ajax)
+			{
+				print "\n".'<script type="text/javascript">';
+				print '$(document).ready(function () {
     			var val='.$sub.';
     			var val2='.$sub2.';
     			if("#localtax1assuj_value".value==undefined){
@@ -2054,13 +2058,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
             print '</td>';
             print '</tr>';
 
-            // Type - Size
+            // Type - Workforce/Staff
             print '<tr><td>'.$form->editfieldkey('ThirdPartyType', 'typent_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("typent_id", $formcompany->typent_array(0), $object->typent_id, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td>';
             if ($conf->browser->layout == 'phone') print '</tr><tr>';
-            print '<td>'.$form->editfieldkey('Staff', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
+            print '<td>'.$form->editfieldkey('Workforce', 'effectif_id', '', $object, 0).'</td><td class="maxwidthonsmartphone">';
             print $form->selectarray("effectif_id", $formcompany->effectif_array(0), $object->effectif_id);
             if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
             print '</td></tr>';
@@ -2130,8 +2134,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			{
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-		        print '<td colspan="3" class="maxwidthonsmartphone">';
-		        print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+				print '<td colspan="3" class="maxwidthonsmartphone">';
+				print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
 				print '</td></tr>';
 			}
 
@@ -2450,11 +2454,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
         print '</td>';
         print '</tr>';
 
-        // Type + Staff
+        // Type + Workforce/Staff
         $arr = $formcompany->typent_array(1);
         $object->typent = $arr[$object->typent_code];
         print '<tr><td>'.$langs->trans("ThirdPartyType").'</td><td>'.$object->typent.'</td>';
-        print '<tr><td>'.$langs->trans("Staff").'</td><td>'.$object->effectif.'</td></tr>';
+        print '<tr><td>'.$langs->trans("Workforce").'</td><td>'.$object->effectif.'</td></tr>';
 
         print '</table>';
 
@@ -2484,56 +2488,56 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			}
 		}
 
-        // Legal
-        print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
+		// Legal
+		print '<tr><td class="titlefield">'.$langs->trans('JuridicalStatus').'</td><td>'.$object->forme_juridique.'</td></tr>';
 
-        // Capital
-        print '<tr><td>'.$langs->trans('Capital').'</td><td>';
-        if ($object->capital) print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
-        else print '&nbsp;';
-        print '</td></tr>';
+		// Capital
+		print '<tr><td>'.$langs->trans('Capital').'</td><td>';
+		if ($object->capital) print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
+		else print '&nbsp;';
+		print '</td></tr>';
 
-        // Default language
-        if (!empty($conf->global->MAIN_MULTILANGS))
-        {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-            print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
-            //$s=picto_from_langcode($object->default_lang);
-            //print ($s?$s.' ':'');
-            $langs->load("languages");
-            $labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
-            print $labellang;
-            print '</td></tr>';
-        }
+		// Default language
+		if (!empty($conf->global->MAIN_MULTILANGS))
+		{
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+			//$s=picto_from_langcode($object->default_lang);
+			//print ($s?$s.' ':'');
+			$langs->load("languages");
+			$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
+			print $labellang;
+			print '</td></tr>';
+		}
 
-        // Incoterms
-        if (!empty($conf->incoterm->enabled))
-        {
-        	print '<tr><td>';
-        	print '<table width="100%" class="nobordernopadding"><tr><td>';
-        	print $langs->trans('IncotermLabel');
-        	print '<td><td class="right">';
-        	if ($user->rights->societe->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a>';
-        	else print '&nbsp;';
-        	print '</td></tr></table>';
-        	print '</td>';
-        	print '<td colspan="3">';
-        	if ($action != 'editincoterm')
-        	{
-        		print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
-        	} else {
-        		print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
-        	}
-        	print '</td></tr>';
-        }
+		// Incoterms
+		if (!empty($conf->incoterm->enabled))
+		{
+			print '<tr><td>';
+			print '<table width="100%" class="nobordernopadding"><tr><td>';
+			print $langs->trans('IncotermLabel');
+			print '<td><td class="right">';
+			if ($user->rights->societe->creer) print '<a class="editfielda" href="'.DOL_URL_ROOT.'/societe/card.php?socid='.$object->id.'&action=editincoterm">'.img_edit('', 1).'</a>';
+			else print '&nbsp;';
+			print '</td></tr></table>';
+			print '</td>';
+			print '<td colspan="3">';
+			if ($action != 'editincoterm')
+			{
+				print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
+			} else {
+				print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?socid='.$object->id);
+			}
+			print '</td></tr>';
+		}
 
 		// Multicurrency
 		if (!empty($conf->multicurrency->enabled))
 		{
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-	        print '<td>';
-	        print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code, 1) : '';
+			print '<td>';
+			print !empty($object->multicurrency_code) ? currency_name($object->multicurrency_code, 1) : '';
 			print '</td></tr>';
 		}
 
@@ -2541,69 +2545,69 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
-        // Parent company
-        if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
-        {
-        	print '<tr><td>';
-        	print '<table class="nobordernopadding" width="100%"><tr><td>';
-        	print $langs->trans('ParentCompany');
-        	print '</td>';
-        	if ($action != 'editparentcompany') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
-        	print '</tr></table>';
-        	print '</td><td>';
-        	if ($action == 'editparentcompany')
-        	{
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
-        	} else {
-        		$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
-        	}
-        	print '</td>';
-        	print '</tr>';
-        }
+		// Parent company
+		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
+		{
+			print '<tr><td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $langs->trans('ParentCompany');
+			print '</td>';
+			if ($action != 'editparentcompany') print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&amp;socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
+			print '</tr></table>';
+			print '</td><td>';
+			if ($action == 'editparentcompany')
+			{
+				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
+			} else {
+				$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'none', 's.rowid <> '.$object->id, 1);
+			}
+			print '</td>';
+			print '</tr>';
+		}
 
-        // Sales representative
-        include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
+		// Sales representative
+		include DOL_DOCUMENT_ROOT.'/societe/tpl/linesalesrepresentative.tpl.php';
 
-        // Module Adherent
-        if (!empty($conf->adherent->enabled))
-        {
-            $langs->load("members");
-            print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
-            print '<td>';
-            $adh = new Adherent($db);
-            $result = $adh->fetch('', '', $object->id);
-            if ($result > 0)
-            {
-                $adh->ref = $adh->getFullName($langs);
-                print $adh->getNomUrl(1);
-            } else {
-                print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
-            }
-            print '</td>';
-            print "</tr>\n";
-        }
+		// Module Adherent
+		if (!empty($conf->adherent->enabled))
+		{
+			$langs->load("members");
+			print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
+			print '<td>';
+			$adh = new Adherent($db);
+			$result = $adh->fetch('', '', $object->id);
+			if ($result > 0)
+			{
+				$adh->ref = $adh->getFullName($langs);
+				print $adh->getNomUrl(1);
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("ThirdpartyNotLinkedToMember").'</span>';
+			}
+			print '</td>';
+			print "</tr>\n";
+		}
 
-        // Webservices url/key
-        if (!empty($conf->syncsupplierwebservices->enabled)) {
-            print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
-            print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
-        }
+		// Webservices url/key
+		if (!empty($conf->syncsupplierwebservices->enabled)) {
+			print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
+			print '<td class="nowrap">'.$langs->trans('WebServiceKey').'</td><td>'.$object->webservices_key.'</td></tr>';
+		}
 
-        print '</table>';
+		print '</table>';
 		print '</div>';
 
-        print '</div></div>';
-        print '<div style="clear:both"></div>';
+		print '</div></div>';
+		print '<div style="clear:both"></div>';
 
-        dol_fiche_end();
+		dol_fiche_end();
 
 
-        /*
+		/*
          *  Actions
          */
-        if ($action != 'presend')
-        {
-	        print '<div class="tabsAction">'."\n";
+		if ($action != 'presend')
+		{
+			print '<div class="tabsAction">'."\n";
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
@@ -2622,50 +2626,50 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 				if (empty($user->socid)) {
 					if (!empty($object->email) || $at_least_one_email_contact)
-			        {
-			        	$langs->load("mails");
-			        	print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
-			        } else {
-			        	$langs->load("mails");
-			       		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
-			        }
+					{
+						$langs->load("mails");
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+					} else {
+						$langs->load("mails");
+				   		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>';
+					}
 				}
 
-		        if ($user->rights->societe->creer)
-		        {
-		            print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-		        }
+				if ($user->rights->societe->creer)
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+				}
 
-		        if (!empty($conf->adherent->enabled))
-		        {
+				if (!empty($conf->adherent->enabled))
+				{
 					$adh = new Adherent($db);
 					$result = $adh->fetch('', '', $object->id);
 					if ($result == 0 && ($object->client == 1 || $object->client == 3) && !empty($conf->global->MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS))
-            		{
-            			print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>';
-            		}
-            	}
+					{
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/adherents/card.php?&action=create&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("NewMember")).'">'.$langs->trans("NewMember").'</a>';
+					}
+				}
 
-		        if ($user->rights->societe->supprimer)
-		        {
-		        	print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>';
-		        }
+				if ($user->rights->societe->supprimer)
+				{
+					print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>';
+				}
 
-		        if ($user->rights->societe->supprimer)
-		        {
-		            if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
-		            {
-		                print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-		            } else {
-		                print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-		            }
-		        }
+				if ($user->rights->societe->supprimer)
+				{
+					if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile))	// We can't use preloaded confirm form with jmobile
+					{
+						print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
+					} else {
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+					}
+				}
 			}
 
-	        print '</div>'."\n";
-        }
+			print '</div>'."\n";
+		}
 
-        //Select mail models is same action as presend
+		//Select mail models is same action as presend
 		if (GETPOST('modelselected')) {
 			$action = 'presend';
 		}
@@ -2674,20 +2678,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		{
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
-	        if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
-	        {
+			if (empty($conf->global->SOCIETE_DISABLE_BUILDDOC))
+			{
 				print '<a name="builddoc"></a>'; // ancre
 
-	            /*
+				/*
 	             * Documents generes
 	             */
-	            $filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
-	            $urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
-	            $genallowed = $user->rights->societe->lire;
-	            $delallowed = $user->rights->societe->creer;
+				$filedir = $conf->societe->multidir_output[$object->entity].'/'.$object->id;
+				$urlsource = $_SERVER["PHP_SELF"]."?socid=".$object->id;
+				$genallowed = $user->rights->societe->lire;
+				$delallowed = $user->rights->societe->creer;
 
-	            print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
-	        }
+				print $formfile->showdocuments('company', $object->id, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, 'entity='.$object->entity, 0, '', $object->default_lang);
+			}
 
 			// Subsidiaries list
 			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES))
@@ -2699,7 +2703,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 
 			$MAXEVENT = 10;
 
-            $morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
+			$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -2731,7 +2735,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 		$trackid = 'thi'.$object->id;
 
 		include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
-    }
+	}
 }
 
 // End of page
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 8551cb61f10..735ff6b49af 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -399,6 +399,8 @@ class Thirdparties extends DolibarrApi
 		// Move links
 		if (!$error)
 		{
+			// This list is also into the societe/card.php file
+			// TODO Mutualise the list into object societe.class.php
 			$objects = array(
 				'Adherent' => '/adherents/class/adherent.class.php',
 				'Societe' => '/societe/class/societe.class.php',
@@ -409,6 +411,7 @@ class Thirdparties extends DolibarrApi
 				'Facture' => '/compta/facture/class/facture.class.php',
 				'FactureRec' => '/compta/facture/class/facture-rec.class.php',
 				'LignePrelevement' => '/compta/prelevement/class/ligneprelevement.class.php',
+				'Mo' => '/mrp/class/mo.class.php',
 				'Contact' => '/contact/class/contact.class.php',
 				'Contrat' => '/contrat/class/contrat.class.php',
 				'Expedition' => '/expedition/class/expedition.class.php',
@@ -420,7 +423,8 @@ class Thirdparties extends DolibarrApi
 				'Livraison' => '/livraison/class/livraison.class.php',
 				'Product' => '/product/class/product.class.php',
 				'Project' => '/projet/class/project.class.php',
-				'User' => '/user/class/user.class.php',
+				'Ticket' => '/ticket/class/ticket.class.php',
+				'User' => '/user/class/user.class.php'
 			);
 
 			//First, all core objects must update their tables
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a8b2caa59c1..9078b2146d4 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -161,8 +161,8 @@ class Societe extends CommonObject
 		'instagram' =>array('type'=>'varchar(255)', 'label'=>'Instagram', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
 		'facebook' =>array('type'=>'varchar(255)', 'label'=>'Facebook', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
 		'twitter' =>array('type'=>'varchar(255)', 'label'=>'Twitter', 'enabled'=>1, 'visible'=>-1, 'position'=>165),*/
-		'fk_effectif' =>array('type'=>'integer', 'label'=>'Fk effectif', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_typent' =>array('type'=>'integer', 'label'=>'Fk typent', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
+		'fk_effectif' =>array('type'=>'integer', 'label'=>'Workforce', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
+		'fk_typent' =>array('type'=>'integer', 'label'=>'TypeOfCompany', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
 		'fk_forme_juridique' =>array('type'=>'integer', 'label'=>'JuridicalStatus', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
 		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'Currency', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'siren' =>array('type'=>'varchar(128)', 'label'=>'Idprof1', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
@@ -173,7 +173,7 @@ class Societe extends CommonObject
 		'idprof6' =>array('type'=>'varchar(128)', 'label'=>'Idprof6', 'enabled'=>1, 'visible'=>-1, 'position'=>207),
 		'tva_intra' =>array('type'=>'varchar(20)', 'label'=>'Tva intra', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
 		'capital' =>array('type'=>'double(24,8)', 'label'=>'Capital', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'fk_stcomm' =>array('type'=>'integer', 'label'=>'Fk stcomm', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
+		'fk_stcomm' =>array('type'=>'integer', 'label'=>'CommercialStatus', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>225),
 		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>230),
 		'prefix_comm' =>array('type'=>'varchar(5)', 'label'=>'Prefix comm', 'enabled'=>'$conf->global->SOCIETE_USEPREFIX', 'visible'=>-1, 'position'=>235),
@@ -464,6 +464,7 @@ class Societe extends CommonObject
 	public $remise_supplier_percent;
 	public $mode_reglement_supplier_id;
 	public $cond_reglement_supplier_id;
+    public $transport_mode_supplier_id;
 
 	/**
      * @var int ID
@@ -763,7 +764,7 @@ class Societe extends CommonObject
 		$this->tva_assuj = 1;
 		$this->status = 1;
 
-		if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
+		if (! empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
 			$this->fields['address']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
 			$this->fields['zip']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
 			$this->fields['town']['showoncombobox'] = $conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST;
@@ -1307,8 +1308,10 @@ class Societe extends CommonObject
 
 			$sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
 			$sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
-			$sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
+			$sql .= ",transport_mode = ".(! empty($this->transport_mode_id) ? "'".$this->db->escape($this->transport_mode_id)."'" : "null");
+            $sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
 			$sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
+			$sql .= ",transport_mode_supplier = ".(! empty($this->transport_mode_supplier_id)? "'".$this->db->escape($this->transport_mode_supplier_id)."'" : "null");
 			$sql .= ",fk_shipping_method = ".(!empty($this->shipping_method_id) ? "'".$this->db->escape($this->shipping_method_id)."'" : "null");
 
 			$sql .= ",client = ".(!empty($this->client) ? $this->client : 0);
@@ -1646,13 +1649,15 @@ class Societe extends CommonObject
 				$this->remise_supplier_percent = $obj->remise_supplier;
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
+				$this->transport_mode_id 	= $obj->transport_mode;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
-				$this->shipping_method_id = ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
-				$this->fk_account = $obj->fk_account;
+				$this->transport_mode_supplier_id	= $obj->transport_mode_supplier;
+				$this->shipping_method_id			= ($obj->fk_shipping_method > 0) ? $obj->fk_shipping_method : null;
+				$this->fk_account	= $obj->fk_account;
 
-				$this->client      = $obj->client;
-				$this->fournisseur = $obj->fournisseur;
+				$this->client		= $obj->client;
+				$this->fournisseur	= $obj->fournisseur;
 
 				$this->note = $obj->note_private; // TODO Deprecated for backward comtability
 				$this->note_private = $obj->note_private;
@@ -2353,11 +2358,12 @@ class Societe extends CommonObject
 				$code .= $this->code_fournisseur.' - ';
 			}
 
-			if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1)
-			{
-				$name = $code.' '.$name;
-			} else {
-				$name = $code;
+			if ($code) {
+				if ($conf->global->SOCIETE_ADD_REF_IN_LIST == 1) {
+					$name = $code.' '.$name;
+				} else {
+					$name = $code;
+				}
 			}
 		}
 
@@ -2423,14 +2429,14 @@ class Societe extends CommonObject
 
 		if (!empty($this->name))
 		{
-			$label .= '<br><b>'.$langs->trans('Name').':</b> '.$this->name;
-			if (!empty($this->name_alias)) $label .= ' ('.$this->name_alias.')';
+			$label .= '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag($this->name);
+			if (!empty($this->name_alias)) $label .= ' ('.dol_escape_htmltag($this->name_alias).')';
 		}
 		$label .= '<br><b>'.$langs->trans('Email').':</b> '.$this->email;
 		if (!empty($this->country_code))
 			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
 		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false))
-			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.$this->tva_intra;
+			$label .= '<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) $label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
@@ -2491,7 +2497,7 @@ class Societe extends CommonObject
 
 		$result .= $linkstart;
 		if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		if ($withpicto != 2) $result .= ($maxlen ?dol_trunc($name, $maxlen) : $name);
+		if ($withpicto != 2) $result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		$result .= $linkend;
 
 		global $action;
@@ -4086,9 +4092,10 @@ class Societe extends CommonObject
 	 *  Return amount of bill not paid and total
 	 *
 	 *  @param     string      $mode    'customer' or 'supplier'
+	 *  @param     int      $late    	0 => all invoice, 1=> only late
 	 *  @return		array				array('opened'=>Amount, 'total'=>Total amount)
 	 */
-    public function getOutstandingBills($mode = 'customer')
+    public function getOutstandingBills($mode = 'customer', $late = 0)
 	{
 		$table = 'facture';
 		if ($mode == 'supplier') $table = 'facture_fourn';
@@ -4103,6 +4110,9 @@ class Societe extends CommonObject
 		if ($mode == 'supplier') $sql = "SELECT rowid, total_ht as total_ht, total_ttc, paye, type, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
 		else $sql = "SELECT rowid, total as total_ht, total_ttc, paye, fk_statut as status, close_code FROM ".MAIN_DB_PREFIX.$table." as f";
 		$sql .= " WHERE fk_soc = ".$this->id;
+		if (!empty($late)) {
+			$sql .= " AND date_lim_reglement < '".$this->db->idate(dol_now())."'";
+		}
 		if ($mode == 'supplier') {
 			$sql .= " AND entity IN (".getEntity('facture_fourn').")";
 		} else {
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 447f57ee40d..24538c78d66 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -289,26 +289,24 @@ if ($result)
 			print "</td>\n";
 			// Type
 			print '<td class="center">';
-			if ($thirdparty_static->client == 1 || $thirdparty_static->client == 3)
+			$obj = $thirdparty_static;
+			$s = '';
+			if (($obj->client == 2 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
 			{
-				$thirdparty_static->name = $langs->trans("Customer");
-				print $thirdparty_static->getNomUrl(0, 'customer', 0, 1);
+				$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
 			}
-			if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / ";
-			if (($thirdparty_static->client == 2 || $thirdparty_static->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
+			if (($obj->client == 1 || $obj->client == 3) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
 			{
-				$thirdparty_static->name = $langs->trans("Prospect");
-				print $thirdparty_static->getNomUrl(0, 'prospect', 0, 1);
+				$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
 			}
-			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $thirdparty_static->fournisseur)
+			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $obj->fournisseur)
 			{
-				if ($thirdparty_static->client) print " / ";
-				$thirdparty_static->name = $langs->trans("Supplier");
-				print $thirdparty_static->getNomUrl(0, 'supplier', 0, 1);
+				$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$companystatic->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
 			}
+			print $s;
 			print '</td>';
 			// Last modified date
-			print '<td class="right">';
+			print '<td class="right tddate">';
 			print dol_print_date($thirdparty_static->date_modification, 'day');
 			print "</td>";
 			print '<td class="right nowrap">';
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 54ee7d5310c..b1cd367f258 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -663,7 +663,7 @@ if ($search_all)
 $moreforfilter = '';
 if (empty($type) || $type == 'c' || $type == 'p')
 {
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -674,7 +674,7 @@ if (empty($type) || $type == 'c' || $type == 'p')
 }
 if (empty($type) || $type == 'f')
 {
-	if (!empty($conf->categorie->enabled))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 	{
 		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
@@ -807,14 +807,14 @@ if (!empty($arrayfields['country.code_iso']['checked']))
 if (!empty($arrayfields['typent.code']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT));
+	print $form->selectarray("search_type_thirdparty", $formcompany->typent_array(0), $search_type_thirdparty, 0, 0, 0, '', 0, 0, 0, (empty($conf->global->SOCIETE_SORT_ON_TYPEENT) ? 'ASC' : $conf->global->SOCIETE_SORT_ON_TYPEENT), 'maxwidth75', 1);
 	print '</td>';
 }
 // Staff
 if (!empty($arrayfields['staff.code']['checked']))
 {
 	print '<td class="liste_titre maxwidthonsmartphone center">';
-	print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, $sort, 'maxwidth100');
+	print $form->selectarray("search_staff", $formcompany->effectif_array(0), $search_staff, 0, 0, 0, '', 0, 0, 0, 'ASC', 'maxwidth100', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s.email']['checked']))
@@ -919,7 +919,7 @@ if (!empty($arrayfields['s.fk_stcomm']['checked']))
 	{
 		$arraystcomm[$val['id']] = ($langs->trans("StatusProspect".$val['id']) != "StatusProspect".$val['id'] ? $langs->trans("StatusProspect".$val['id']) : $val['label']);
 	}
-	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2);
+	print $form->selectarray('search_stcomm', $arraystcomm, $search_stcomm, -2, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s2.nom']['checked']))
@@ -951,7 +951,7 @@ if (!empty($arrayfields['s.tms']['checked']))
 if (!empty($arrayfields['s.status']['checked']))
 {
 	print '<td class="liste_titre center minwidth75imp">';
-	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1);
+	print $form->selectarray('search_status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 	print '</td>';
 }
 if (!empty($arrayfields['s.import_key']['checked']))
diff --git a/htdocs/societe/notify/card.php b/htdocs/societe/notify/card.php
index ba1ea5d54a5..7ddea52a65a 100644
--- a/htdocs/societe/notify/card.php
+++ b/htdocs/societe/notify/card.php
@@ -72,57 +72,57 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    $error = 0;
+	$error = 0;
 
-    // Add a notification
-    if ($action == 'add')
-    {
-        if (empty($contactid))
-        {
-    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
-            $error++;
-        }
-        if ($actionid <= 0)
-        {
-    	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
-            $error++;
-        }
+	// Add a notification
+	if ($action == 'add')
+	{
+		if (empty($contactid))
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Contact")), null, 'errors');
+			$error++;
+		}
+		if ($actionid <= 0)
+		{
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
+			$error++;
+		}
 
-        if (!$error)
-        {
-            $db->begin();
+		if (!$error)
+		{
+			$db->begin();
 
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-            $sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
-            if ($db->query($sql))
-            {
-                $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
-                $sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+			$sql .= " WHERE fk_soc=".$socid." AND fk_contact=".$contactid." AND fk_action=".$actionid;
+			if ($db->query($sql))
+			{
+				$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_soc, fk_contact, fk_action)";
+				$sql .= " VALUES ('".$db->idate($now)."',".$socid.",".$contactid.",".$actionid.")";
 
-                if (!$db->query($sql))
-                {
-                    $error++;
-                    dol_print_error($db);
-                }
-            } else {
-                dol_print_error($db);
-            }
+				if (!$db->query($sql))
+				{
+					$error++;
+					dol_print_error($db);
+				}
+			} else {
+				dol_print_error($db);
+			}
 
-            if (!$error)
-            {
-                $db->commit();
-            } else {
-                $db->rollback();
-            }
-        }
-    }
+			if (!$error)
+			{
+				$db->commit();
+			} else {
+				$db->rollback();
+			}
+		}
+	}
 
-    // Remove a notification
-    if ($action == 'delete')
-    {
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST('actid', 'int');
-        $db->query($sql);
-    }
+	// Remove a notification
+	if ($action == 'delete')
+	{
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST('actid', 'int');
+		$db->query($sql);
+	}
 }
 
 
@@ -144,46 +144,46 @@ llxHeader('', $title, $help_url);
 
 if ($result > 0)
 {
-    $langs->load("other");
+	$langs->load("other");
 
-    $head = societe_prepare_head($object);
+	$head = societe_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"), -1, 'company');
+	dol_fiche_head($head, 'notify', $langs->trans("ThirdParty"), -1, 'company');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
+	dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent">';
 
-    // Prefix
-    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
-    {
-        print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
-    }
+	// Prefix
+	if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	{
+		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+	}
 
-    if ($object->client)
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('CustomerCode').'</td><td colspan="3">';
-        print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
-        print '</td></tr>';
-    }
+	if ($object->client)
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('CustomerCode').'</td><td colspan="3">';
+		print $object->code_client;
+		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		print '</td></tr>';
+	}
 
-    if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
-    {
-        print '<tr><td class="titlefield">';
-        print $langs->trans('SupplierCode').'</td><td colspan="3">';
-        print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
-        print '</td></tr>';
-    }
+	if (!empty($conf->fournisseur->enabled) && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+	{
+		print '<tr><td class="titlefield">';
+		print $langs->trans('SupplierCode').'</td><td colspan="3">';
+		print $object->code_fournisseur;
+		if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+		print '</td></tr>';
+	}
 
-    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
     print '<td colspan="3">';
     $nbofrecipientemails=0;
     $notify=new Notify($db);
@@ -195,159 +195,159 @@ if ($result > 0)
     print $nbofrecipientemails;
     print '</td></tr>';*/
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
-
-    dol_fiche_end();
-
-    print "\n";
-
-    // Help
-    print '<div class="opacitymedium">';
-    print $langs->trans("NotificationsDesc");
-    print '<br>'.$langs->trans("NotificationsDescUser");
-    print '<br>'.$langs->trans("NotificationsDescContact");
-    print '<br>'.$langs->trans("NotificationsDescGlobal");
 	print '</div>';
 
-    print '<br><br>'."\n";
+	dol_fiche_end();
+
+	print "\n";
+
+	// Help
+	print '<div class="opacitymedium">';
+	print $langs->trans("NotificationsDesc");
+	print '<br>'.$langs->trans("NotificationsDescUser");
+	print '<br>'.$langs->trans("NotificationsDescContact");
+	print '<br>'.$langs->trans("NotificationsDescGlobal");
+	print '</div>';
+
+	print '<br><br>'."\n";
 
 
-    // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
+	// Add notification form
+	print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$socid.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    $param = "&socid=".$socid;
+	$param = "&socid=".$socid;
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('');
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
-    $var = false;
-    $listofemails = $object->thirdparty_and_contact_email_array();
-    if (count($listofemails) > 0)
-    {
-        $actions = array();
+	$var = false;
+	$listofemails = $object->thirdparty_and_contact_email_array();
+	if (count($listofemails) > 0)
+	{
+		$actions = array();
 
-        // Load array of available notifications
-        $notificationtrigger = new InterfaceNotification($db);
-        $listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
+		// Load array of available notifications
+		$notificationtrigger = new InterfaceNotification($db);
+		$listofmanagedeventfornotification = $notificationtrigger->getListOfManagedEvents();
 
-        foreach ($listofmanagedeventfornotification as $managedeventfornotification)
-        {
+		foreach ($listofmanagedeventfornotification as $managedeventfornotification)
+		{
  			$label = ($langs->trans("Notify_".$managedeventfornotification['code']) != "Notify_".$managedeventfornotification['code'] ? $langs->trans("Notify_".$managedeventfornotification['code']) : $managedeventfornotification['label']);
-            $actions[$managedeventfornotification['rowid']] = $label;
-        }
-        print '<tr class="oddeven nohover"><td class="maxwidthonsmartphone">';
-        print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
-        print '</td>';
-        print '<td class="maxwidthonsmartphone">';
-        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
-        print '</td>';
-        print '<td>';
-        $type = array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid", $type);
-        print '</td>';
-        print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-        print '</tr>';
-    } else {
-        print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
-        print $langs->trans("YouMustCreateContactFirst");
-        print '</td></tr>';
-    }
+			$actions[$managedeventfornotification['rowid']] = $label;
+		}
+		print '<tr class="oddeven nohover"><td class="maxwidthonsmartphone">';
+		print img_picto('', 'contact', '', false, 0, 0, '', 'paddingright').$form->selectarray("contactid", $listofemails, '', 0, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
+		print '</td>';
+		print '<td class="maxwidthonsmartphone">';
+		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1, 0, 0, '', 0, 0, 0, '', 'maxwidthonsmartphone');
+		print '</td>';
+		print '<td>';
+		$type = array('email'=>$langs->trans("EMail"));
+		print $form->selectarray("typeid", $type);
+		print '</td>';
+		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+		print '</tr>';
+	} else {
+		print '<tr class="oddeven"><td colspan="4" class="opacitymedium">';
+		print $langs->trans("YouMustCreateContactFirst");
+		print '</td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 
 
-    // List of notifications enabled for contacts
-    $sql = "SELECT n.rowid, n.type,";
-    $sql .= " a.code, a.label,";
-    $sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql .= " ".MAIN_DB_PREFIX."socpeople c";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND c.rowid = n.fk_contact";
-    $sql .= " AND c.fk_soc = ".$object->id;
+	// List of notifications enabled for contacts
+	$sql = "SELECT n.rowid, n.type,";
+	$sql .= " a.code, a.label,";
+	$sql .= " c.rowid as contactid, c.lastname, c.firstname, c.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+	$sql .= " ".MAIN_DB_PREFIX."socpeople c";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND c.rowid = n.fk_contact";
+	$sql .= " AND c.fk_soc = ".$object->id;
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    } else {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
+	// List of active notifications
+	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('', '', '');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('', '', '');
+	print '</tr>';
 
 	$langs->load("errors");
 	$langs->load("other");
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $contactstatic = new Contact($db);
+		$contactstatic = new Contact($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $contactstatic->id = $obj->contact_id;
-            $contactstatic->lastname = $obj->lastname;
-            $contactstatic->firstname = $obj->firstname;
-            print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
-            if ($obj->type == 'email')
-            {
-                if (isValidEmail($obj->email))
-                {
-                    print ' &lt;'.$obj->email.'&gt;';
-                } else {
-                    $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
-                }
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
-            print '</td>';
-            print '<td class="right"><a href="card.php?socid='.$socid.'&action=delete&token='.newToken().'&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    }
+			$contactstatic->id = $obj->contact_id;
+			$contactstatic->lastname = $obj->lastname;
+			$contactstatic->firstname = $obj->firstname;
+			print '<tr class="oddeven"><td>'.$contactstatic->getNomUrl(1);
+			if ($obj->type == 'email')
+			{
+				if (isValidEmail($obj->email))
+				{
+					print ' &lt;'.$obj->email.'&gt;';
+				} else {
+					$langs->load("errors");
+					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
+				}
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("SMS");
+			print '</td>';
+			print '<td class="right"><a href="card.php?socid='.$socid.'&action=delete&token='.newToken().'&actid='.$obj->rowid.'">'.img_delete().'</a></td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	}
 
-    // List of notifications enabled for fixed email
-    /*
+	// List of notifications enabled for fixed email
+	/*
     foreach($conf->global as $key => $val)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
@@ -389,7 +389,7 @@ if ($result > 0)
 		print '</tr>';
     }*/
 
-    /*if ($user->admin)
+	/*if ($user->admin)
     {
 	    $var = ! $var;
 		print '<tr class="oddeven"><td colspan="4">';
@@ -397,104 +397,104 @@ if ($result > 0)
 		print '</td></tr>';
     }*/
 
-    print '</table>';
+	print '</table>';
 
 
-    print '<br><br>'."\n";
+	print '<br><br>'."\n";
 
 
-    // List
-    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql .= " a.code, a.label";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify as n ";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND n.fk_soc = ".$object->id;
-    $sql .= $db->order($sortfield, $sortorder);
+	// List
+	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
+	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+	$sql .= " a.code, a.label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify as n ";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as c ON n.fk_contact = c.rowid";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND n.fk_soc = ".$object->id;
+	$sql .= $db->order($sortfield, $sortorder);
 
-    // Count total nb of records
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	}
 
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    } else {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    $param = '&socid='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = '&socid='.$object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="socid" value="'.$object->id.'">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="socid" value="'.$object->id.'">';
 
-    // List of active notifications
-    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	// List of active notifications
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
-    //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
+	print '</tr>';
 
-    if ($num > 0)
-    {
-        $i = 0;
+	if ($num > 0)
+	{
+		$i = 0;
 
-        $contactstatic = new Contact($db);
+		$contactstatic = new Contact($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven"><td>';
-            if ($obj->id > 0)
-            {
-	            $contactstatic->id = $obj->id;
-	            $contactstatic->lastname = $obj->lastname;
-	            $contactstatic->firstname = $obj->firstname;
-	            print $contactstatic->getNomUrl(1);
-	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            } else {
+			print '<tr class="oddeven"><td>';
+			if ($obj->id > 0)
+			{
+				$contactstatic->id = $obj->id;
+				$contactstatic->lastname = $obj->lastname;
+				$contactstatic->firstname = $obj->firstname;
+				print $contactstatic->getNomUrl(1);
+				print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
+			} else {
 				print $obj->email;
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print $label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
-            print '</td>';
-            // TODO Add link to object here for other types
-            /*print '<td>';
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print $label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("Sms");
+			print '</td>';
+			// TODO Add link to object here for other types
+			/*print '<td>';
             if ($obj->object_type == 'order')
             {
 				$orderstatic->id=$obj->object_id;
@@ -502,19 +502,19 @@ if ($result > 0)
 				print $orderstatic->getNomUrl(1);
             }
            	print '</td>';*/
-            // print
-            print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    } else {
-    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-    }
+			// print
+			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
+	print '</form>';
 } else dol_print_error('', 'RecordNotFound');
 
 // End of page
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 3b2cc60cce4..70b0541f4dc 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -550,12 +550,12 @@ if (empty($reshook))
 
 			$db->begin();
 
-            if (empty($newcu)) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;
-            } else {
-                $sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."societe_account";
-                $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-            }
+			if (empty($newcu)) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity;
+			} else {
+				$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX."societe_account";
+				$sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND status = ".$servicestatus." AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+			}
 
 			$resql = $db->query($sql);
 			$num = $db->num_rows($resql); // Note: $num is always 0 on an update and delete, it is defined for select only.
@@ -601,21 +601,21 @@ if (empty($reshook))
 
 			$db->begin();
 
-            if (empty($newsup)) {
-                $sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
-                // TODO Add site and site_account on oauth_token table
-                //$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
-            } else {
-                try {
-                    $stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
-                    $tokenstring['stripe_user_id'] = $stripesup->id;
-                    $tokenstring['type'] = $stripesup->type;
-                    $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
-                    $sql .= " SET tokenstring = '".dol_json_encode($tokenstring)."'";
-                    $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-                    // TODO Add site and site_account on oauth_token table
-                    $sql .= " WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
-                } catch (Exception $e) {
+			if (empty($newsup)) {
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
+				// TODO Add site and site_account on oauth_token table
+				//$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity;
+			} else {
+				try {
+					$stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
+					$tokenstring['stripe_user_id'] = $stripesup->id;
+					$tokenstring['type'] = $stripesup->type;
+					$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
+					$sql .= " SET tokenstring = '".dol_json_encode($tokenstring)."'";
+					$sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '".$db->escape($site_account)."') AND fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+					// TODO Add site and site_account on oauth_token table
+					$sql .= " WHERE fk_soc = ".$object->id." AND service = '".$db->escape($service)."' AND entity = ".$conf->entity; // Keep = here for entity. Only 1 record must be modified !
+				} catch (Exception $e) {
 					$error++;
 					setEventMessages($e->getMessage(), null, 'errors');
 				}
@@ -625,14 +625,14 @@ if (empty($reshook))
 			$num = $db->num_rows($resql);
 			if (empty($num) && !empty($newsup))
 			{
-                try {
-                    $stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
-                    $tokenstring['stripe_user_id'] = $stripesup->id;
-                    $tokenstring['type'] = $stripesup->type;
-                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, fk_soc, entity, tokenstring)";
-                    $sql .= " VALUES ('".$db->escape($service)."', ".$object->id.", ".$conf->entity.", '".dol_json_encode($tokenstring)."')";
-                    // TODO Add site and site_account on oauth_token table
-                } catch (Exception $e) {
+				try {
+					$stripesup = \Stripe\Account::retrieve($db->escape(GETPOST('key_account_supplier', 'alpha')));
+					$tokenstring['stripe_user_id'] = $stripesup->id;
+					$tokenstring['type'] = $stripesup->type;
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, fk_soc, entity, tokenstring)";
+					$sql .= " VALUES ('".$db->escape($service)."', ".$object->id.", ".$conf->entity.", '".dol_json_encode($tokenstring)."')";
+					// TODO Add site and site_account on oauth_token table
+				} catch (Exception $e) {
 					$error++;
 					setEventMessages($e->getMessage(), null, 'errors');
 				}
@@ -686,22 +686,22 @@ if (empty($reshook))
 			try {
 				if (preg_match('/pm_/', $source))
 				{
-                    $payment_method = \Stripe\PaymentMethod::retrieve($source, array("stripe_account" => $stripeacc));
-                    if ($payment_method)
-			        {
-					    $payment_method->detach();
-				    }
+					$payment_method = \Stripe\PaymentMethod::retrieve($source, array("stripe_account" => $stripeacc));
+					if ($payment_method)
+					{
+						$payment_method->detach();
+					}
 				} else {
-				    $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
-				    $card = $cu->sources->retrieve("$source");
-				    if ($card) {
-					    // $card->detach();  Does not work with card_, only with src_
-					    if (method_exists($card, 'detach')) {
+					$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
+					$card = $cu->sources->retrieve("$source");
+					if ($card) {
+						// $card->detach();  Does not work with card_, only with src_
+						if (method_exists($card, 'detach')) {
 							$card->detach();
 						} else {
 							$card->delete();
 						}
-				    }
+					}
 				}
 
 				$url = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
@@ -832,7 +832,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
 			if (!empty($conf->stripe->enabled) && $stripecu && $action != 'editkey_account')
 			{
-			    $connect = '';
+				$connect = '';
 				if (!empty($stripeacc)) $connect = $stripeacc.'/';
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$stripecu;
 				if ($servicestatus)
@@ -853,7 +853,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 			print '</td></tr>';
 		}
-    }
+	}
 
 	if ($object->fournisseur)
 	{
@@ -886,7 +886,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		print $form->editfieldval("StripeConnectAccount", 'key_account_supplier', $stripesupplieracc, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
 		if (!empty($conf->stripe->enabled) && $stripesupplieracc && $action != 'editkey_account_supplier')
 		{
-		    $connect = '';
+			$connect = '';
 
 			$url = 'https://dashboard.stripe.com/test/connect/accounts/'.$stripesupplieracc;
 			if ($servicestatus)
@@ -922,7 +922,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$morehtmlright = '';
 		if (!empty($conf->global->STRIPE_ALLOW_LOCAL_CARD))
 		{
-            $morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
+			$morehtmlright .= dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=createcard');
 		}
 		print load_fiche_titre($langs->trans('StripePaymentModes').($stripeacc ? ' (Stripe connection with StripeConnect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
 
@@ -1038,9 +1038,9 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print $companypaymentmodetemp->stripe_card_ref;
 							if ($companypaymentmodetemp->stripe_card_ref)
 							{
-							    $connect = '';
-							    if (!empty($stripeacc)) $connect = $stripeacc.'/';
-							    $url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$companypaymentmodetemp->stripe_card_ref;
+								$connect = '';
+								if (!empty($stripeacc)) $connect = $stripeacc.'/';
+								$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$companypaymentmodetemp->stripe_card_ref;
 								if ($servicestatus)
 								{
 									$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$companypaymentmodetemp->stripe_card_ref;
@@ -1138,8 +1138,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				$url = 'https://dashboard.stripe.com/'.$connect.'test/search?query='.$src->id;
 				if ($servicestatus)
 				{
-				    //$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
-				    $url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
+					//$url='https://dashboard.stripe.com/'.$connect.'sources/'.$src->id;
+					$url = 'https://dashboard.stripe.com/'.$connect.'search?query='.$src->id;
 				}
 				print " <a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')."</a>";
 				print '</td>';
@@ -1266,30 +1266,30 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		}
 		print "</table>";
 		print "</div>";
-        print '<br>';
+		print '<br>';
 	}
 
   	// List of Stripe payment modes
 	if (!empty($conf->stripe->enabled) && !empty($conf->stripeconnect->enabled) && !empty($stripesupplieracc))
 	{
-        print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
-        $balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
+		print load_fiche_titre($langs->trans('StripeBalance').($stripesupplieracc ? ' (Stripe connection with StripeConnect account '.$stripesupplieracc.')' : ' (Stripe connection with keys from Stripe module setup)'), $morehtmlright, 'stripe-s');
+		$balance = \Stripe\Balance::retrieve(array("stripe_account" => $stripesupplieracc));
 		print '<table class="liste centpercent">'."\n";
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans('Currency').'</td>';
 		print '<td>'.$langs->trans('Available').'</td>';
 		print '<td>'.$langs->trans('Pending').'</td>';
-        print '<td>'.$langs->trans('Total').'</td>';
-        print '</tr>';
+		print '<td>'.$langs->trans('Total').'</td>';
+		print '</tr>';
 
-        $currencybalance = array();
+		$currencybalance = array();
 		if (is_array($balance->available) && count($balance->available))
 		{
 			foreach ($balance->available as $cpt)
 			{
-		        $arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
-		        if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
-    					$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
+				$arrayzerounitcurrency = array('BIF', 'CLP', 'DJF', 'GNF', 'JPY', 'KMF', 'KRW', 'MGA', 'PYG', 'RWF', 'VND', 'VUV', 'XAF', 'XOF', 'XPF');
+				if (!in_array($cpt->currency, $arrayzerounitcurrency)) {
+						$currencybalance[$cpt->currency]['available'] = $cpt->amount / 100;
 				} else {
 					$currencybalance[$cpt->currency]['available'] = $cpt->amount;
 				}
@@ -1297,7 +1297,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-        if (is_array($balance->pending) && count($balance->pending))
+		if (is_array($balance->pending) && count($balance->pending))
 		{
 			foreach ($balance->pending as $cpt)
 			{
@@ -1308,7 +1308,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 					$currencybalance[$cpt->currency]['pending'] = $currencybalance[$cpt->currency]['available'] + $cpt->amount;
 				}
 			}
-        }
+		}
 
 		if (is_array($currencybalance))
 		{
@@ -1318,13 +1318,13 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			}
 		}
 
-        print '</table>';
-        print '<br>';
+		print '</table>';
+		print '<br>';
 	}
 
 	// List of bank accounts
 
-    $morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create');
+	$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&amp;action=create');
 
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
 
@@ -1371,11 +1371,11 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				} elseif ($val == 'BankAccountNumberKey') {
 					$string .= $rib->cle_rib.' ';
 				}
-                // Already output after
-                // } elseif ($val == 'BIC') {
-                //     $string .= $rib->bic.' ';
-                // } elseif ($val == 'IBAN') {
-                //     $string .= $rib->iban.' ';*/
+				// Already output after
+				// } elseif ($val == 'BIC') {
+				//     $string .= $rib->bic.' ';
+				// } elseif ($val == 'IBAN') {
+				//     $string .= $rib->iban.' ';*/
 				//}
 			}
 			if (!empty($rib->label) && $rib->number) {
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 0e4ecfedbcb..d974792ddd4 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -71,112 +71,112 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
 
 if (empty($reshook))
 {
-    if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
-    {
-        $search_prod = $search_label = $search_price = $search_price_ttc = '';
-    }
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) // Both test are required to be compatible with all browsers
+	{
+		$search_prod = $search_label = $search_price = $search_price_ttc = '';
+	}
 
-    if ($action == 'add_customer_price_confirm' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	if (! (GETPOST('prodid', 'int') > 0)) {
-    		$error++;
-    		setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Product")), null, 'errors');
-    		$action = 'add_customer_price';
-    	}
+	if ($action == 'add_customer_price_confirm' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		if (! (GETPOST('prodid', 'int') > 0)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->trans("Product")), null, 'errors');
+			$action = 'add_customer_price';
+		}
 
-    	if (! $error) {
-	    	$update_child_soc = GETPOST('updatechildprice');
+		if (! $error) {
+			$update_child_soc = GETPOST('updatechildprice');
 
-	    	// add price by customer
-	    	$prodcustprice->fk_soc = $socid;
-	    	$prodcustprice->fk_product = GETPOST('prodid', 'int');
-	    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-	    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-	    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+			// add price by customer
+			$prodcustprice->fk_soc = $socid;
+			$prodcustprice->fk_product = GETPOST('prodid', 'int');
+			$prodcustprice->price = price2num(GETPOST("price"), 'MU');
+			$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+			$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
 
-	    	$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
+			$tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'
 
-	    	// We must define tva_tx, npr and local taxes
-	    	$vatratecode = '';
-	    	$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
-	    	$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
-	    	$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
-	    	// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
-	    	if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
-	    	{
-	    	    // We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
-	    	    $vatratecode = $reg[1];
-	    	    // Get record from code
-	    	    $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
-	    	    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
-	    	    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
-	    	    $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
-	    	    $sql .= " AND t.code ='".$db->escape($vatratecode)."'";
-	    	    $resql = $db->query($sql);
-	    	    if ($resql)
-	    	    {
-	    	        $obj = $db->fetch_object($resql);
-	    	        $npr = $obj->recuperableonly;
-	    	        $localtax1 = $obj->localtax1;
-	    	        $localtax2 = $obj->localtax2;
-	    	        $localtax1_type = $obj->localtax1_type;
-	    	        $localtax2_type = $obj->localtax2_type;
-	    	    }
-	    	}
+			// We must define tva_tx, npr and local taxes
+			$vatratecode = '';
+			$tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot
+			$npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;
+			$localtax1 = 0; $localtax2 = 0; $localtax1_type = '0'; $localtax2_type = '0';
+			// If value contains the unique code of vat line (new recommended method), we use it to find npr and local taxes
+			if (preg_match('/\((.*)\)/', $tva_tx_txt, $reg))
+			{
+				// We look into database using code (we can't use get_localtax() because it depends on buyer that is not known). Same in update price.
+				$vatratecode = $reg[1];
+				// Get record from code
+				$sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
+				$sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";
+				$sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$db->escape($mysoc->country_code)."'";
+				$sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";
+				$sql .= " AND t.code ='".$db->escape($vatratecode)."'";
+				$resql = $db->query($sql);
+				if ($resql)
+				{
+					$obj = $db->fetch_object($resql);
+					$npr = $obj->recuperableonly;
+					$localtax1 = $obj->localtax1;
+					$localtax2 = $obj->localtax2;
+					$localtax1_type = $obj->localtax1_type;
+					$localtax2_type = $obj->localtax2_type;
+				}
+			}
 
-	    	$prodcustprice->default_vat_code = $vatratecode;
-	    	$prodcustprice->tva_tx = $tva_tx;
-	    	$prodcustprice->recuperableonly = $npr;
-	    	$prodcustprice->localtax1_tx = $localtax1;
-	    	$prodcustprice->localtax2_tx = $localtax2;
-	    	$prodcustprice->localtax1_type = $localtax1_type;
-	    	$prodcustprice->localtax2_type = $localtax2_type;
+			$prodcustprice->default_vat_code = $vatratecode;
+			$prodcustprice->tva_tx = $tva_tx;
+			$prodcustprice->recuperableonly = $npr;
+			$prodcustprice->localtax1_tx = $localtax1;
+			$prodcustprice->localtax2_tx = $localtax2;
+			$prodcustprice->localtax1_type = $localtax1_type;
+			$prodcustprice->localtax2_type = $localtax2_type;
 
-	    	$result = $prodcustprice->create($user, 0, $update_child_soc);
+			$result = $prodcustprice->create($user, 0, $update_child_soc);
 
-	    	if ($result < 0) {
-	    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-	    	} else {
-	    		setEventMessages($langs->trans('Save'), null, 'mesgs');
-	    	}
+			if ($result < 0) {
+				setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+			} else {
+				setEventMessages($langs->trans('Save'), null, 'mesgs');
+			}
 
-	    	$action = '';
-    	}
-    }
+			$action = '';
+		}
+	}
 
-    if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	// Delete price by customer
-    	$prodcustprice->id = GETPOST('lineid');
-    	$result = $prodcustprice->delete($user);
+	if ($action == 'delete_customer_price' && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		// Delete price by customer
+		$prodcustprice->id = GETPOST('lineid');
+		$result = $prodcustprice->delete($user);
 
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
-    	} else {
-    		setEventMessages($langs->trans('Delete'), null, 'errors');
-    	}
-    	$action = '';
-    }
+		if ($result < 0) {
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'mesgs');
+		} else {
+			setEventMessages($langs->trans('Delete'), null, 'errors');
+		}
+		$action = '';
+	}
 
-    if ($action == 'update_customer_price_confirm' && !$_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
-    	$prodcustprice->fetch(GETPOST('lineid', 'int'));
+	if ($action == 'update_customer_price_confirm' && !$_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+		$prodcustprice->fetch(GETPOST('lineid', 'int'));
 
-    	$update_child_soc = GETPOST('updatechildprice');
+		$update_child_soc = GETPOST('updatechildprice');
 
-    	// update price by customer
-    	$prodcustprice->price = price2num(GETPOST("price"), 'MU');
-    	$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
-    	$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
-    	$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
-    	$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
+		// update price by customer
+		$prodcustprice->price = price2num(GETPOST("price"), 'MU');
+		$prodcustprice->price_min = price2num(GETPOST("price_min"), 'MU');
+		$prodcustprice->price_base_type = GETPOST("price_base_type", 'alpha');
+		$prodcustprice->tva_tx = str_replace('*', '', GETPOST("tva_tx"));
+		$prodcustprice->recuperableonly = (preg_match('/\*/', GETPOST("tva_tx")) ? 1 : 0);
 
-    	$result = $prodcustprice->update($user, 0, $update_child_soc);
-    	if ($result < 0) {
-    		setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-    	} else {
-    		setEventMessages($langs->trans('Save'), null, 'mesgs');
-    	}
+		$result = $prodcustprice->update($user, 0, $update_child_soc);
+		if ($result < 0) {
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+		} else {
+			setEventMessages($langs->trans('Save'), null, 'mesgs');
+		}
 
-    	$action = '';
-    }
+		$action = '';
+	}
 }
 
 
@@ -242,7 +242,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 	$sortfield = GETPOST("sortfield", 'alpha');
 	$sortorder = GETPOST("sortorder", 'alpha');
-    $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+	$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 	$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 	if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 	$offset = $limit * $page;
@@ -262,15 +262,15 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		$filter ['prod.ref'] = $search_prod;
 	}
 
-	if (! empty($search_label)) {
+	if (!empty($search_label)) {
 		$filter ['prod.label'] = $search_label;
 	}
 
-	if (! empty($search_price)) {
+	if (!empty($search_price)) {
 		$filter ['t.price'] = $search_price;
 	}
 
-	if (! empty($search_price_ttc)) {
+	if (!empty($search_price_ttc)) {
 		$filter ['t.price_ttc'] = $search_price_ttc;
 	}
 
@@ -429,7 +429,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		print '<br></form>';
 	} elseif ($action == 'showlog_customer_price') {
-	    print '<br>';
+		print '<br>';
 		print '<!-- showlog_customer_price -->'."\n";
 
 		$filter = array(
@@ -503,7 +503,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'">'.$langs->trans("Ok").'</a></div>';
 		print "\n</div><br>\n";
 	} else {
-        // View mode
+		// View mode
 
 		/* ************************************************************************** */
 		/*                                                                            */
@@ -519,118 +519,118 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print "\n</div>\n";
 
 
-        // Count total nb of records
-        $nbtotalofrecords = '';
-        if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-        {
-            $nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
-        }
+		// Count total nb of records
+		$nbtotalofrecords = '';
+		if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+		{
+			$nbtotalofrecords = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+		}
 
-        $result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
-        if ($result < 0)
-        {
-            setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
-        }
+		$result = $prodcustprice->fetch_all($sortorder, $sortfield, $conf->liste_limit, $offset, $filter);
+		if ($result < 0)
+		{
+			setEventMessages($prodcustprice->error, $prodcustprice->errors, 'errors');
+		}
 
-        $option = '&search_prod=' . $search_prod . '&id=' . $object->id . '&label=' . $search_label .'&price=' . $search_price . '&price_ttc=' . $search_price_ttc;
+		$option = '&search_prod=' . $search_prod . '&id=' . $object->id . '&label=' . $search_label .'&price=' . $search_price . '&price_ttc=' . $search_price_ttc;
 
-	    print '<!-- view specific price for each product -->'."\n";
+		print '<!-- view specific price for each product -->'."\n";
 
-	    print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVER['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
+		print_barre_liste($langs->trans('PriceForEachProduct'), $page, $_SERVER['PHP_SELF'], $option, $sortfield, $sortorder, '', count($prodcustprice->lines), $nbtotalofrecords, '');
 
-        print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-        print '<input type="hidden" name="token" value="'.newToken().'">';
-        print '<input type="hidden" name="id" value="'.$object->id.'">';
+		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-        print '<table class="noborder centpercent">';
+		print '<table class="noborder centpercent">';
 
-        print '<tr class="liste_titre">';
-        print '<td>' . $langs->trans("Ref") . '</td>';
+		print '<tr class="liste_titre">';
+		print '<td>' . $langs->trans("Ref") . '</td>';
 		print '<td>' . $langs->trans("Product") . '</td>';
-        print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
-        print '<td class="center">'.$langs->trans("PriceBase").'</td>';
-        print '<td class="right">'.$langs->trans("VAT").'</td>';
-        print '<td class="right">'.$langs->trans("HT").'</td>';
-        print '<td class="right">'.$langs->trans("TTC").'</td>';
-        print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
-        print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
-        print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
-        print '<td>&nbsp;</td>';
-        print '</tr>';
+		print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
+		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
+		print '<td class="right">'.$langs->trans("VAT").'</td>';
+		print '<td class="right">'.$langs->trans("HT").'</td>';
+		print '<td class="right">'.$langs->trans("TTC").'</td>';
+		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
+		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
+		print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
+		print '<td>&nbsp;</td>';
+		print '</tr>';
 
-        if (count($prodcustprice->lines) > 0 || $search_prod)
-        {
-            print '<tr class="liste_titre">';
+		if (count($prodcustprice->lines) > 0 || $search_prod)
+		{
+			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="'.$search_prod.'" size="20"></td>';
-            print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="' . $search_label . '" size="20"></td>';
-            print '<td class="liste_titre" colspan="3">&nbsp;</td>';
-            print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price" value="' . $search_price . '" size="10"></td>';
-            print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price_ttc" value="' . $search_price_ttc . '" size="10"></td>';
-            print '<td class="liste_titre" colspan="3">&nbsp;</td>';
-            // Print the search button
-            print '<td class="liste_titre maxwidthsearch">';
-            $searchpicto = $form->showFilterAndCheckAddButtons(0);
-            print $searchpicto;
-            print '</td>';
-            print '</tr>';
-        }
+			print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="' . $search_label . '" size="20"></td>';
+			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price" value="' . $search_price . '" size="10"></td>';
+			print '<td class="liste_titre" align="right"><input type="text" class="flat" name="search_price_ttc" value="' . $search_price_ttc . '" size="10"></td>';
+			print '<td class="liste_titre" colspan="3">&nbsp;</td>';
+			// Print the search button
+			print '<td class="liste_titre maxwidthsearch">';
+			$searchpicto = $form->showFilterAndCheckAddButtons(0);
+			print $searchpicto;
+			print '</td>';
+			print '</tr>';
+		}
 
-        if (count($prodcustprice->lines) > 0)
-        {
-            foreach ($prodcustprice->lines as $line)
-            {
-                print '<tr class="oddeven">';
+		if (count($prodcustprice->lines) > 0)
+		{
+			foreach ($prodcustprice->lines as $line)
+			{
+				print '<tr class="oddeven">';
 
-                $staticprod = new Product($db);
-                $staticprod->fetch($line->fk_product);
+				$staticprod = new Product($db);
+				$staticprod->fetch($line->fk_product);
 
-                print "<td>".$staticprod->getNomUrl(1)."</td>";
-                print "<td>" . $staticprod->label ."</td>";
-                print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
+				print "<td>".$staticprod->getNomUrl(1)."</td>";
+				print "<td>" . $staticprod->label ."</td>";
+				print "<td>".dol_print_date($line->datec, "dayhour")."</td>";
 
-                print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
-                print '<td class="right">'.vatrate($line->tva_tx.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), true, $line->recuperableonly)."</td>";
-                print '<td class="right">'.price($line->price)."</td>";
-                print '<td class="right">'.price($line->price_ttc)."</td>";
-                print '<td class="right">'.price($line->price_min).'</td>';
-                print '<td class="right">'.price($line->price_min_ttc).'</td>';
+				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
+				print '<td class="right">'.vatrate($line->tva_tx.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), true, $line->recuperableonly)."</td>";
+				print '<td class="right">'.price($line->price)."</td>";
+				print '<td class="right">'.price($line->price_ttc)."</td>";
+				print '<td class="right">'.price($line->price_min).'</td>';
+				print '<td class="right">'.price($line->price_min_ttc).'</td>';
 
-                // User
-                $userstatic = new User($db);
-                $userstatic->fetch($line->fk_user);
-                print '<td class="right">';
-                print $userstatic->getLoginUrl(1);
-                print '</td>';
+				// User
+				$userstatic = new User($db);
+				$userstatic->fetch($line->fk_user);
+				print '<td class="right">';
+				print $userstatic->getLoginUrl(1);
+				print '</td>';
 
-                // Action
-                if ($user->rights->produit->creer || $user->rights->service->creer)
-                {
-                    print '<td class="right nowraponall">';
-                    print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;socid='.$object->id.'&amp;prodid='.$line->fk_product.'">';
-                    print img_info();
-                    print '</a>';
-                    print ' ';
-                    print '<a class="editfielda paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
-                    print img_edit('default', 0, 'style="vertical-align: middle;"');
-                    print '</a>';
-                    print ' ';
-                    print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
-                    print img_delete('default', 'style="vertical-align: middle;"');
-                    print '</a>';
-                    print '</td>';
-                }
+				// Action
+				if ($user->rights->produit->creer || $user->rights->service->creer)
+				{
+					print '<td class="right nowraponall">';
+					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=showlog_customer_price&amp;socid='.$object->id.'&amp;prodid='.$line->fk_product.'">';
+					print img_info();
+					print '</a>';
+					print ' ';
+					print '<a class="editfielda paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=edit_customer_price&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
+					print img_edit('default', 0, 'style="vertical-align: middle;"');
+					print '</a>';
+					print ' ';
+					print '<a class="paddingleftonly paddingrightonly" href="'.$_SERVER["PHP_SELF"].'?action=delete_customer_price&amp;token='.newToken().'&amp;socid='.$object->id.'&amp;lineid='.$line->id.'">';
+					print img_delete('default', 'style="vertical-align: middle;"');
+					print '</a>';
+					print '</td>';
+				}
 
-                print "</tr>\n";
-            }
-        } else {
-            $colspan = 9;
-            if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
-            print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
-        }
+				print "</tr>\n";
+			}
+		} else {
+			$colspan = 9;
+			if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan += 1;
+			print '<tr class="oddeven"><td colspan="'.$colspan.'">'.$langs->trans('None').'</td></tr>';
+		}
 
-        print "</table>";
+		print "</table>";
 
-        print "</form>";
+		print "</form>";
 	}
 }
 
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 8544417b2e4..beadfee1a89 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -76,8 +76,7 @@ $stripeacc = $stripe->getStripeAccount($service);
 	print $langs->trans('ErrorStripeAccountNotDefined');
 }*/
 
-if (!$rowid)
-{
+if (!$rowid) {
 	$option = array('limit' => $limit + 1);
 	$num = 0;
 
@@ -102,185 +101,185 @@ if (!$rowid)
 		//$param.='&ending_before_'.($page+1).'='.$list->data[($limit-1)]->id;
 
 		$moreforfilter = '';
-
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	    print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	    print '<input type="hidden" name="action" value="list">';
-	    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	    print '<input type="hidden" name="page" value="'.$page.'">';
-
-	    $title = $langs->trans("StripeChargeList");
-	    $title .= ($stripeacc ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
-
-		print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', 'hidepaginationprevious', $limit);
-
-	    print '<div class="div-table-responsive">';
-	    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-	    print '<tr class="liste_titre">';
-	    print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	    print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	    print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	    print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
-	    print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
-	    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
-	    print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
-	    print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
-	    print "</tr>\n";
-
-		//print $list;
-		$i = 0;
-		foreach ($list->data as $charge)
-		{
-			if ($i >= $limit) {
-				break;
-			}
-
-		    if ($charge->refunded == '1') {
-		    	$status = img_picto($langs->trans("refunded"), 'statut6');
-		    } elseif ($charge->paid == '1') {
-	            $status = img_picto($langs->trans((string) $charge->status), 'statut4');
-		    } else {
-		    	$label = $langs->trans("Message").": ".$charge->failure_message."<br>";
-		    	$label .= $langs->trans("Network").": ".$charge->outcome->network_status."<br>";
-		    	$label .= $langs->trans("Status").": ".$langs->trans((string) $charge->outcome->seller_message);
-		    	$status = $form->textwithpicto(img_picto($langs->trans((string) $charge->status), 'statut8'), $label, -1);
-		    }
-
-	        if ($charge->payment_method_details->type == 'card') {
-			    $type = $langs->trans("card");
-		    } elseif ($charge->source->type == 'card') {
-				$type = $langs->trans("card");
-		    } elseif ($charge->payment_method_details->type == 'three_d_secure') {
-				$type = $langs->trans("card3DS");
-		    } elseif ($charge->payment_method_details->type == 'sepa_debit') {
-				$type = $langs->trans("sepadebit");
-		    } elseif ($charge->payment_method_details->type == 'ideal') {
-				$type = $langs->trans("iDEAL");
-		    }
-
-		    // Why this ?
-	        /*if (! empty($charge->payment_intent)) {
-				if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
-		    		$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
-				} else {
-					$charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
-				}
-	        }*/
-
-			// The metadata FULLTAG is defined by the online payment page
-			$FULLTAG = $charge->metadata->FULLTAG;
-
-			// Save into $tmparray all metadata
-			$tmparray = dolExplodeIntoArray($FULLTAG, '.', '=');
-			// Load origin object according to metadata
-			if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
-			{
-				$societestatic->fetch($tmparray['CUS']);
-			} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
-			{
-				$societestatic->fetch($charge->metadata->dol_thirdparty_id);
-			} else {
-				$societestatic->id = 0;
-			}
-			if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
-			{
-				$memberstatic->fetch($tmparray['MEM']);
-			} else {
-				$memberstatic->id = 0;
-			}
-
-			print '<tr class="oddeven">';
-
-	        if (!empty($stripeacc)) $connect = $stripeacc.'/';
-
-			// Ref
-			$url = 'https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
-	        if ($servicestatus)
-	        {
-	        	$url = 'https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
-	        }
-			print "<td>";
-	        print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."</a>";
-	        if ($charge->payment_intent) print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
-			print "</td>\n";
-
-			// Stripe customer
-			print "<td>";
-	        if (!empty($conf->stripe->enabled) && !empty($stripeacc)) $connect = $stripeacc.'/';
-			$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer;
-			if ($servicestatus)
-			{
-	            $url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
-			}
-			if (!empty($charge->customer))
-			{
-	    		print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').' '.$charge->customer.'</a>';
-			}
-	        print "</td>\n";
-
-			// Link
-			print "<td>";
-			if ($societestatic->id > 0)
-			{
-				print $societestatic->getNomUrl(1);
-			} elseif ($memberstatic->id > 0)
-			{
-				print $memberstatic->getNomUrl(1);
-			}
-			print "</td>\n";
-
-			// Origin
-			print "<td>";
-			if ($charge->metadata->dol_type == "order" || $charge->metadata->dol_type == "commande") {
-				$object = new Commande($db);
-				$object->fetch($charge->metadata->dol_id);
-	            if ($object->id > 0) {
-	                print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
-	            } else {
-	                print $FULLTAG;
-	            }
-			} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
-				print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
-				$object = new Facture($db);
-				$object->fetch($charge->metadata->dol_id);
-	            if ($object->id > 0) {
-			        print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
-	            } else {
-					print $FULLTAG;
-				}
-			} else {
-				print $FULLTAG;
-			}
-		    print "</td>\n";
-
-			// Date payment
-		    print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
-		    // Type
-		    print '<td>';
-			print $type;
-		    print '</td>';
-		    // Amount
-		    print '<td class="right">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
-		    // Status
-		    print '<td class="right">';
-		    print $status;
-		    print "</td>\n";
-
-		    print "</tr>\n";
-
-		    $i++;
-		}
-
-		print '</table>';
-		print '</div>';
-		print '</form>';
 	} catch (Exception $e) {
 		print $e->getMessage();
 	}
+
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+
+	$title = $langs->trans("StripeChargeList");
+	$title .= ($stripeacc ? ' (Stripe connection with Stripe OAuth Connect account '.$stripeacc.')' : ' (Stripe connection with keys from Stripe module setup)');
+
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $totalnboflines, 'title_accountancy.png', 0, '', 'hidepaginationprevious', $limit);
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("StripeCustomerId", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Customer", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Origin", $_SERVER["PHP_SELF"], "", "", "", "", $sortfield, $sortorder);
+	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'left ');
+	print_liste_field_titre("Paid", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder, 'right ');
+	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
+	print "</tr>\n";
+
+	//print $list;
+	$i = 0;
+	foreach ($list->data as $charge)
+	{
+		if ($i >= $limit) {
+			break;
+		}
+
+		if ($charge->refunded == '1') {
+			$status = img_picto($langs->trans("refunded"), 'statut6');
+		} elseif ($charge->paid == '1') {
+			$status = img_picto($langs->trans((string) $charge->status), 'statut4');
+		} else {
+			$label = $langs->trans("Message").": ".$charge->failure_message."<br>";
+			$label .= $langs->trans("Network").": ".$charge->outcome->network_status."<br>";
+			$label .= $langs->trans("Status").": ".$langs->trans((string) $charge->outcome->seller_message);
+			$status = $form->textwithpicto(img_picto($langs->trans((string) $charge->status), 'statut8'), $label, -1);
+		}
+
+		if ($charge->payment_method_details->type == 'card') {
+			$type = $langs->trans("card");
+		} elseif ($charge->source->type == 'card') {
+			$type = $langs->trans("card");
+		} elseif ($charge->payment_method_details->type == 'three_d_secure') {
+			$type = $langs->trans("card3DS");
+		} elseif ($charge->payment_method_details->type == 'sepa_debit') {
+			$type = $langs->trans("sepadebit");
+		} elseif ($charge->payment_method_details->type == 'ideal') {
+			$type = $langs->trans("iDEAL");
+		}
+
+		// Why this ?
+		/*if (! empty($charge->payment_intent)) {
+		 if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+		 $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent);
+		 } else {
+		 $charge = \Stripe\PaymentIntent::retrieve($charge->payment_intent, array("stripe_account" => $stripeacc));
+		 }
+		 }*/
+
+		// The metadata FULLTAG is defined by the online payment page
+		$FULLTAG = $charge->metadata->FULLTAG;
+
+		// Save into $tmparray all metadata
+		$tmparray = dolExplodeIntoArray($FULLTAG, '.', '=');
+		// Load origin object according to metadata
+		if (!empty($tmparray['CUS']) && $tmparray['CUS'] > 0)
+		{
+			$societestatic->fetch($tmparray['CUS']);
+		} elseif (!empty($charge->metadata->dol_thirdparty_id) && $charge->metadata->dol_thirdparty_id > 0)
+		{
+			$societestatic->fetch($charge->metadata->dol_thirdparty_id);
+		} else {
+			$societestatic->id = 0;
+		}
+		if (!empty($tmparray['MEM']) && $tmparray['MEM'] > 0)
+		{
+			$memberstatic->fetch($tmparray['MEM']);
+		} else {
+			$memberstatic->id = 0;
+		}
+
+		print '<tr class="oddeven">';
+
+		if (!empty($stripeacc)) $connect = $stripeacc.'/';
+
+		// Ref
+		$url = 'https://dashboard.stripe.com/'.$connect.'test/payments/'.$charge->id;
+		if ($servicestatus)
+		{
+			$url = 'https://dashboard.stripe.com/'.$connect.'payments/'.$charge->id;
+		}
+		print "<td>";
+		print "<a href='".$url."' target='_stripe'>".img_picto($langs->trans('ShowInStripe'), 'globe')." ".$charge->id."</a>";
+		if ($charge->payment_intent) print '<br><span class="opacitymedium">'.$charge->payment_intent.'</span>';
+		print "</td>\n";
+
+		// Stripe customer
+		print "<td>";
+		if (!empty($conf->stripe->enabled) && !empty($stripeacc)) $connect = $stripeacc.'/';
+		$url = 'https://dashboard.stripe.com/'.$connect.'test/customers/'.$charge->customer;
+		if ($servicestatus)
+		{
+			$url = 'https://dashboard.stripe.com/'.$connect.'customers/'.$charge->customer;
+		}
+		if (!empty($charge->customer))
+		{
+			print '<a href="'.$url.'" target="_stripe">'.img_picto($langs->trans('ShowInStripe'), 'globe').' '.$charge->customer.'</a>';
+		}
+		print "</td>\n";
+
+		// Link
+		print "<td>";
+		if ($societestatic->id > 0)
+		{
+			print $societestatic->getNomUrl(1);
+		} elseif ($memberstatic->id > 0)
+		{
+			print $memberstatic->getNomUrl(1);
+		}
+		print "</td>\n";
+
+		// Origin
+		print "<td>";
+		if ($charge->metadata->dol_type == "order" || $charge->metadata->dol_type == "commande") {
+			$object = new Commande($db);
+			$object->fetch($charge->metadata->dol_id);
+			if ($object->id > 0) {
+				print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
+			} else {
+				print $FULLTAG;
+			}
+		} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
+			print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
+			$object = new Facture($db);
+			$object->fetch($charge->metadata->dol_id);
+			if ($object->id > 0) {
+				print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
+			} else {
+				print $FULLTAG;
+			}
+		} else {
+			print $FULLTAG;
+		}
+		print "</td>\n";
+
+		// Date payment
+		print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
+		// Type
+		print '<td>';
+		print $type;
+		print '</td>';
+		// Amount
+		print '<td class="right">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
+		// Status
+		print '<td class="right">';
+		print $status;
+		print "</td>\n";
+
+		print "</tr>\n";
+
+		$i++;
+	}
+
+	print '</table>';
+	print '</div>';
+	print '</form>';
 }
 
 // End of page
diff --git a/htdocs/stripe/config.php b/htdocs/stripe/config.php
index e6dc75c04ec..4cae940d955 100644
--- a/htdocs/stripe/config.php
+++ b/htdocs/stripe/config.php
@@ -53,4 +53,4 @@ if (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))
 
 \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 \Stripe\Stripe::setAppInfo("Dolibarr Stripe", DOL_VERSION, "https://www.dolibarr.org"); // add dolibarr version
-\Stripe\Stripe::setApiVersion(empty($conf->global->STRIPE_FORCE_VERSION) ? "2019-09-09" : $conf->global->STRIPE_FORCE_VERSION); // force version API
+\Stripe\Stripe::setApiVersion(empty($conf->global->STRIPE_FORCE_VERSION) ? "2020-08-27" : $conf->global->STRIPE_FORCE_VERSION); // force version API
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index cd75fec476c..8ed8ed906a8 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -77,8 +77,7 @@ $stripeacc = $stripe->getStripeAccount($service);
 
 if (!$rowid) {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	if ($optioncss != '')
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="action" value="list">';
@@ -106,8 +105,6 @@ if (!$rowid) {
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "", "", "", '', '', '', 'right ');
 	print "</tr>\n";
 
-	print "</tr>\n";
-
 	try {
 		if ($stripeacc)
 		{
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 92759515ba4..8a198720e56 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -2103,7 +2103,7 @@ class SupplierProposal extends CommonObject
 		$sql .= " c.datec, c.date_valid as datev, c.date_cloture as dateo,";
 		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_cloture";
 		$sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposal as c";
-		$sql .= " WHERE c.rowid = ".$id;
+		$sql .= " WHERE c.rowid = ".((int) $id);
 
 		$result = $this->db->query($sql);
 
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index b0f8bf40609..7f2576ca0f6 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -463,7 +463,7 @@ if ($resql)
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view products
-	if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire))
+	if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire && ($user->rights->produit->lire || $user->rights->service->lire))
 	{
 		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 		$moreforfilter .= '<div class="divsearchfield">';
diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index b396655dea4..c7ebbebffb7 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -42,6 +42,7 @@ $catname = GETPOST('catname', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $printer1 = GETPOST('printer1', 'alpha');
 $printer2 = GETPOST('printer2', 'alpha');
+$printer3 = GETPOST('printer3', 'alpha');
 
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
@@ -64,6 +65,14 @@ if ($action == "SavePrinter2") {
 	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_2", $printedcategories, 'chaine', 0, '', $conf->entity);
 }
 
+if ($action == "SavePrinter3") {
+	$printedcategories = ";";
+	if (is_array($printer3)) foreach ($printer3 as $cat) {
+		$printedcategories = $printedcategories.$cat.";";
+	}
+	dolibarr_set_const($db, "TAKEPOS_PRINTED_CATEGORIES_3", $printedcategories, 'chaine', 0, '', $conf->entity);
+}
+
 
 /*
  * View
@@ -206,6 +215,33 @@ if ($nbofentries > 0)
 	print '</table></td>';
 	print '</tr>';
 }
+
+//Printer3
+print '<table class="liste nohover" width="100%">';
+print '<tr class="liste_titre"><td>'.$langs->trans("Printer").' 3</td><td></td><td class="right">';
+print '</td></tr>';
+$nbofentries = (count($data) - 1);
+print '<form action="orderprinters.php">';
+if ($nbofentries > 0)
+{
+	print '<tr class="pair"><td colspan="3">';
+	print '<input type="hidden" name="action" value="SavePrinter3">';
+	foreach ($data as $row) {
+		if (strpos($conf->global->TAKEPOS_PRINTED_CATEGORIES_3, ';'.$row["rowid"].';') !== false) $checked = 'checked'; else $checked = '';
+		if ($row["fk_menu"] == 0) print '<input type="checkbox" name="printer3[]" value="'.$row["rowid"].'" '.$checked.'>'.$row["label"].'<br>';
+	}
+	print '</td></tr>';
+} else {
+	print '<tr class="pair">';
+	print '<td colspan="3"><table class="nobordernopadding"><tr class="nobordernopadding"><td>'.img_picto_common('', 'treemenu/branchbottom.gif').'</td>';
+	print '<td valign="middle">';
+	print $langs->trans("NoCategoryYet");
+	print '</td>';
+	print '<td>&nbsp;</td>';
+	print '</table></td>';
+	print '</tr>';
+}
+
 print "</table>";
 print '<input type="submit" value="'.$langs->trans("Save").'"></form>';
 
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 384be4f8f13..108fdea0b64 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -87,6 +87,7 @@ if (GETPOST('action', 'alpha') == 'set')
     $res = dolibarr_set_const($db, "TAKEPOS_PRINTER_TO_USE".$terminaltouse, GETPOST('TAKEPOS_PRINTER_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
     $res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER1_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
     $res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER2_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTER3_TO_USE".$terminaltouse, GETPOST('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
     $res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
     $res = dolibarr_set_const($db, "TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS".$terminaltouse, GETPOST('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity);
 
@@ -242,6 +243,10 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 		print '<td>';
 		print $form->selectarray('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}), 1);
 		print '</td></tr>';
+		print '<tr class="oddeven"><td>'.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 3</td>';
+		print '<td>';
+		print $form->selectarray('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}), 1);
+		print '</td></tr>';
 	}
 	$printer->listPrintersTemplates();
 	$templates = array();
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index 973bbabba2d..b9db20ab516 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -479,8 +479,7 @@ div.description_content {
 	width: unset;
 }
 .topnav{
-	background: rgb(<?php echo $colorbackhmenu1 ?>);
-	background-image: linear-gradient(-45deg, <?php echo colorAdjustBrightness(colorArrayToHex(colorStringToArray($colorbackhmenu1)), '5'); ?>, rgb(<?php echo $colorbackhmenu1 ?>));
+	background: var(--colorbackhmenu1);
 	overflow: hidden;
 	height: 100%;
 }
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 459225fda03..630c49b58a7 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -58,7 +58,7 @@ if ($setterminal > 0)
 	setcookie("takeposterminal", $setterminal, (time() + (86400 * 354)), '/', null, false, true); // Permanent takeposterminal var in a cookie
 }
 
-if ($setcurrency!="")
+if ($setcurrency != "")
 {
 	$_SESSION["takeposcustomercurrency"] = $setcurrency;
 }
@@ -812,7 +812,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			?>
 			</a>
 			<?php
-			if (!empty($conf->multicurrency->enabled)){
+			if (!empty($conf->multicurrency->enabled)) {
 				print '<a class="valignmiddle tdoverflowmax100 minwidth75" id="multicurrency" onclick="ModalBox(\'ModalCurrency\');" title=""><span class="fas fa-coins paddingrightonly"></span>'.$langs->trans("Currency").'</a>';
 			}
 			?>
@@ -850,10 +850,10 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 	<div class="modal-content">
 		<div class="modal-header">
 		<span class="close" href="#" onclick="document.getElementById('ModalTerminal').style.display = 'none';">&times;</span>
-		<h3><?php print $langs->trans("TerminalSelect");?></h3>
+		<h3><?php print $langs->trans("TerminalSelect"); ?></h3>
 	</div>
 	<div class="modal-body">
-		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print $langs->trans("Terminal");?> 1</button>
+		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print $langs->trans("Terminal"); ?> 1</button>
 		<?php
 		for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++)
 		{
@@ -865,12 +865,12 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 </div>
 
 <!-- Modal multicurrency box -->
-if (!empty($conf->multicurrency->enabled)){
+<?php if (!empty($conf->multicurrency->enabled)) { ?>
 <div id="ModalCurrency" class="modal">
 	<div class="modal-content">
 		<div class="modal-header">
 			<span class="close" href="#" onclick="document.getElementById('ModalCurrency').style.display = 'none';">&times;</span>
-			<h3><?php print $langs->trans("SetMultiCurrencyCode");?></h3>
+			<h3><?php print $langs->trans("SetMultiCurrencyCode"); ?></h3>
 		</div>
 		<div class="modal-body">
 			<?php
@@ -882,12 +882,11 @@ if (!empty($conf->multicurrency->enabled)){
 				while ($obj = $db->fetch_object($resql))
 				print '<button type="button" class="block" onclick="location.href=\'index.php?setcurrency='.$obj->code.'\'">'.$obj->code.'</button>';
 			}
-
 			?>
 		</div>
 	</div>
 </div>
-}
+<?php } ?>
 
 	<div class="row1<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) print 'withhead'; ?>">
 
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 28bce40c6f8..fc0fd749242 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -253,7 +253,7 @@ if ($action == 'valid' && $user->rights->facture->creer)
 			if ($pay != "delayed") {
 				$payment->create($user);
 				$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
-				$remaintopay = $invoice->getRemainToPay();    // Recalculate remain to pay after the payment is recorded
+				$remaintopay = $invoice->getRemainToPay(); // Recalculate remain to pay after the payment is recorded
 			}
 		}
 
@@ -278,7 +278,7 @@ if ($action == 'history')
 	$invoice->fetch($placeid);
 }
 
-if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"]!="") {
+if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "") {
 	$invoice->setMulticurrencyCode($_SESSION["takeposcustomercurrency"]);
 }
 
@@ -288,6 +288,7 @@ if (($action == "addline" || $action == "freezone") && $placeid == 0)
 	$invoice->date = dol_now();
 	$invoice->module_source = 'takepos';
 	$invoice->pos_source = $_SESSION["takeposterminal"];
+	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"])?$_SESSION["takeposinvoiceentity"]:$conf->entity;
 
 	if ($invoice->socid <= 0)
 	{
@@ -531,8 +532,10 @@ if ($action == "order" and $placeid != 0)
 	$footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';
 	$order_receipt_printer1 = "";
 	$order_receipt_printer2 = "";
+	$order_receipt_printer3 = "";
 	$catsprinter1 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_1);
 	$catsprinter2 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_2);
+	$catsprinter3 = explode(';', $conf->global->TAKEPOS_PRINTED_CATEGORIES_3);
 	foreach ($invoice->lines as $line)
 	{
 		if ($line->special_code == "4") {
@@ -587,6 +590,34 @@ if ($action == "order" and $placeid != 0)
 	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='2' and fk_facture=".$invoice->id; // Set as printed
 	$db->query($sql);
 	$invoice->fetch($placeid); //Reload object after set lines as printed
+	$linestoprint = 0;
+
+	foreach ($invoice->lines as $line)
+	{
+		if ($line->special_code == "4") {
+			continue;
+		}
+		$c = new Categorie($db);
+		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
+		$result = array_intersect($catsprinter3, $existing);
+		$count = count($result);
+		if ($count > 0) {
+			$linestoprint++;
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=".$line->id; //Set to print on printer 3
+			$db->query($sql);
+			$order_receipt_printer3 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
+			if (!empty($line->array_options['options_order_notes'])) $order_receipt_printer3 .= "<br>(".$line->array_options['options_order_notes'].")";
+			$order_receipt_printer3 .= '</td></tr>';
+		}
+	}
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" && $linestoprint > 0) {
+		$invoice->fetch($placeid); //Reload object before send to printer
+		$printer->orderprinter = 3;
+		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 3
+	}
+	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='3' and fk_facture=".$invoice->id; // Set as printed
+	$db->query($sql);
+	$invoice->fetch($placeid); //Reload object after set lines as printed
 }
 
 $sectionwithinvoicelink = '';
@@ -737,7 +768,7 @@ function TakeposPrinting(id){
 
 function TakeposConnector(id){
 	console.log("TakeposConnector" + id);
-	$.get("ajax/ajax.php?action=printinvoiceticket&term=<?php echo $_SESSION["takeposterminal"];?>&id="+id, function(data, status){
+	$.get("ajax/ajax.php?action=printinvoiceticket&term=<?php echo $_SESSION["takeposterminal"]; ?>&id="+id, function(data, status){
         $.ajax({
 			type: "POST",
 			url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',
@@ -862,7 +893,7 @@ if (!empty($conf->use_javascript_ajax))
 print '<!-- invoice.php place='.(int) $place.' invoice='.$invoice->ref.' mobilepage='.$mobilepage.' $_SESSION["basiclayout"]='.$_SESSION["basiclayout"].' conf->global->TAKEPOS_BAR_RESTAURANT='.$conf->global->TAKEPOS_BAR_RESTAURANT.' -->'."\n";
 print '<div class="div-table-responsive-no-min invoice">';
 print '<table id="tablelines" class="noborder noshadow postablelines" width="100%">';
-if ($mobilepage == "invoice" || $mobilepage == "") {
+if ($sectionwithinvoicelink && ($mobilepage == "invoice" || $mobilepage == "")) {
 	print '<tr><td colspan="4">'.$sectionwithinvoicelink.'</td></tr>';
 }
 print '<tr class="liste_titre nodrag nodrop">';
@@ -902,12 +933,12 @@ if ($_SESSION["basiclayout"] != 1)
 	// In phone version only show when it is invoice page
 	if ($mobilepage == "invoice" || $mobilepage == "") {
 		print '<span id="linecolht-span-total" style="font-size:1.3em; font-weight: bold;">'.price($invoice->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</span>';
-		if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"]!="" && $conf->currency!=$_SESSION["takeposcustomercurrency"]) {
+		if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 			//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 			include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 			$multicurrency = new MultiCurrency($db);
 			$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
-			print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($invoice->total_ttc*$multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
+			print '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($invoice->total_ttc * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
 		}
 		print '</td>';
 	}
@@ -1108,12 +1139,12 @@ if ($placeid > 0)
 				$htmlforlines .= '</td>';
 				$htmlforlines .= '<td class="right classfortooltip" title="'.$moreinfo.'">';
 				$htmlforlines .= price($line->total_ttc, 1, '', 1, -1, -1, $conf->currency);
-				if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"]!="" && $conf->currency!=$_SESSION["takeposcustomercurrency"]) {
+				if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 					//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 					include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 					$multicurrency = new MultiCurrency($db);
 					$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
-					$htmlforlines .= '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($line->total_ttc*$multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
+					$htmlforlines .= '<br><span id="linecolht-span-total" style="font-size:0.9em; font-style:italic;">('.price($line->total_ttc * $multicurrency->rate->rate).' '.$_SESSION["takeposcustomercurrency"].')</span>';
 				}
 				$htmlforlines .= '</td>';
 			}
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index e7ad45319a6..b0e745e2211 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -231,7 +231,7 @@ else print "var received=0;";
 <div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
 
 <div class="paymentbordline paymentbordlinetotal">
-	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code);?></span></span></center>
+	<center><span class="takepospay"><font color="white"><?php echo $langs->trans('TotalTTC'); ?>: </font><span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span></center>
 </div>
 <?php if ($remaintopay != $invoice->total_ttc) { ?>
 <div class="paymentbordline paymentbordlineremain">
@@ -245,7 +245,7 @@ else print "var received=0;";
 	<center><span class="takepospay"><font color="white"><?php echo $langs->trans("Change"); ?>: </font><span class="change2 colorwhite"><?php echo price(0, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span><input type="hidden" id="change2" class="change2" value="0"></span></center>
 </div>
 <?php
-if (! empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
 	print '<div class="paymentbordline paddingtop paddingbottom">
 	<center>';
 	$filter = '';
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index f32e4d82061..0773053d4a2 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -91,7 +91,7 @@ if (!empty($hookmanager->resPrint)) {
 <br>
 <p class="left">
 <?php
-$constFreeText = 'TAKEPOS_HEADER' . $_SESSION['takeposterminal'];
+$constFreeText = 'TAKEPOS_HEADER'.$_SESSION['takeposterminal'];
 if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeText}))
 {
 	$newfreetext = '';
@@ -127,8 +127,8 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 	<tr>
         <th class="center"><?php print $langs->trans("Label"); ?></th>
         <th class="right"><?php print $langs->trans("Qty"); ?></th>
-        <th class="right"><?php if ($gift!=1) print $langs->trans("Price"); ?></th>
-        <th class="right"><?php if ($gift!=1) print $langs->trans("TotalTTC"); ?></th>
+        <th class="right"><?php if ($gift != 1) print $langs->trans("Price"); ?></th>
+        <th class="right"><?php if ($gift != 1) print $langs->trans("TotalTTC"); ?></th>
 	</tr>
     </thead>
     <tbody>
@@ -142,8 +142,8 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
         else echo $line->description; ?>
         </td>
         <td class="right"><?php echo $line->qty; ?></td>
-        <td class="right"><?php if ($gift!=1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
-        <td class="right"><?php if ($gift!=1) echo price($line->total_ttc, 1); ?></td>
+        <td class="right"><?php if ($gift != 1) echo price(price2num($line->total_ttc / $line->qty, 'MT'), 1); ?></td>
+        <td class="right"><?php if ($gift != 1) echo price($line->total_ttc, 1); ?></td>
     </tr>
         <?php
     }
@@ -153,8 +153,8 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 <br>
 <table class="right">
 <tr>
-    <th class="right"><?php if ($gift!=1) echo $langs->trans("TotalHT"); ?></th>
-    <td class="right"><?php if ($gift!=1) echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+    <th class="right"><?php if ($gift != 1) echo $langs->trans("TotalHT"); ?></th>
+    <td class="right"><?php if ($gift != 1) echo price($object->total_ht, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <?php if ($conf->global->TAKEPOS_TICKET_VAT_GROUPPED) {
 	$vat_groups = array();
@@ -168,27 +168,27 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)
 	foreach ($vat_groups as $key => $val) {
 	    ?>
 	<tr>
-		<th align="right"><?php if ($gift!=1) echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>
-		<td align="right"><?php if ($gift!=1) echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+		<th align="right"><?php if ($gift != 1) echo $langs->trans("VAT").' '.vatrate($key, 1); ?></th>
+		<td align="right"><?php if ($gift != 1) echo price($val, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 	</tr>
         <?php
 	}
 } else { ?>
 <tr>
-	<th class="right"><?php if ($gift!=1) echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) echo $langs->trans("TotalVAT").'</th><td class="right">'.price($object->total_tva, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <?php } ?>
 <tr>
-	<th class="right"><?php if ($gift!=1) echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
+	<th class="right"><?php if ($gift != 1) echo ''.$langs->trans("TotalTTC").'</th><td class="right">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency)."\n"; ?></td>
 </tr>
 <?php
-if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"]!="" && $conf->currency!=$_SESSION["takeposcustomercurrency"]) {
+if (!empty($conf->multicurrency->enabled) && $_SESSION["takeposcustomercurrency"] != "" && $conf->currency != $_SESSION["takeposcustomercurrency"]) {
 	//Only show customer currency if multicurrency module is enabled, if currency selected and if this currency selected is not the same as main currency
 	include_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 	$multicurrency = new MultiCurrency($db);
 	$multicurrency->fetch(0, $_SESSION["takeposcustomercurrency"]);
 	echo '<tr><th class="right">';
-	if ($gift!=1) echo ''.$langs->trans("TotalTTC").' '.$_SESSION["takeposcustomercurrency"].'</th><td class="right">'.price($object->total_ttc*$multicurrency->rate->rate, 1, '', 1, - 1, - 1, $_SESSION["takeposcustomercurrency"])."\n";
+	if ($gift != 1) echo ''.$langs->trans("TotalTTC").' '.$_SESSION["takeposcustomercurrency"].'</th><td class="right">'.price($object->total_ttc * $multicurrency->rate->rate, 1, '', 1, - 1, - 1, $_SESSION["takeposcustomercurrency"])."\n";
 	echo '</td></tr>';
 }
 
@@ -211,12 +211,12 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 			echo $langs->transnoentitiesnoconv("PaymentTypeShort".$row->code);
 			echo '</td>';
 			echo '<td class="right">';
-			$amount_payment=($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
+			$amount_payment = ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) ? $row->multicurrency_amount : $row->amount;
 			if ($row->code == "LIQ") $amount_payment = $amount_payment + $row->pos_change; // Show amount with excess received if is cash payment
 			echo price($amount_payment, 1, '', 1, - 1, - 1, $conf->currency);
 			echo '</td>';
 			echo '</tr>';
-			if ($row->code == "LIQ" && $row->pos_change>0) // Print change only in cash payments
+			if ($row->code == "LIQ" && $row->pos_change > 0) // Print change only in cash payments
 			{
 				echo '<tr>';
 				echo '<td class="right">';
@@ -238,7 +238,7 @@ if ($conf->global->TAKEPOS_PRINT_PAYMENT_METHOD) {
 <br>
 <br>
 <?php
-$constFreeText = 'TAKEPOS_FOOTER' . $_SESSION['takeposterminal'];
+$constFreeText = 'TAKEPOS_FOOTER'.$_SESSION['takeposterminal'];
 if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeText}))
 {
 	$newfreetext = '';
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index f618b260db1..ea97e6d560b 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -51,31 +51,31 @@ $invoice->fetch($facid);
 $customer = new Societe($db);
 $customer->fetch($invoice->socid);
 
-if ($action=="send")
+if ($action == "send")
 {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
-    $formmail = new FormMail($db);
-    $outputlangs = new Translate('', $conf);
-    $model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;
-    $arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);
-    $subject = $arraydefaultmessage->topic;
+	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+	$formmail = new FormMail($db);
+	$outputlangs = new Translate('', $conf);
+	$model_id = $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE;
+	$arraydefaultmessage = $formmail->getEMailTemplate($db, 'facture_send', $user, $outputlangs, $model_id);
+	$subject = $arraydefaultmessage->topic;
 
-    ob_start(); // turn on output receipt
-    include 'receipt.php';
-    $receipt = ob_get_contents(); // get the contents of the output buffer
-    ob_end_clean();
+	ob_start(); // turn on output receipt
+	include 'receipt.php';
+	$receipt = ob_get_contents(); // get the contents of the output buffer
+	ob_end_clean();
 
-    $msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
-    $sendto=$email;
-    $from=$mysoc->email;
-    $mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);
-    if ($mail->error || $mail->errors) {
-        setEventMessages($mail->error, $mail->errors, 'errors');
-    } else {
-        $result = $mail->sendfile();
-    }
-    exit;
+	$msg="<html>".$arraydefaultmessage->content."<br>".$receipt."</html>";
+	$sendto=$email;
+	$from=$mysoc->email;
+	$mail = new CMailFile($subject, $sendto, $from, $msg, array(), array(), array(), '', '', 0, 1);
+	if ($mail->error || $mail->errors) {
+		setEventMessages($mail->error, $mail->errors, 'errors');
+	} else {
+		$result = $mail->sendfile();
+	}
+	exit;
 }
 $arrayofcss = array('/takepos/css/pos.css.php');
 $arrayofjs  = array();
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index b52fd6f7e51..50bf77c00ff 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -73,7 +73,7 @@ CKEDITOR.editorConfig = function( config )
 	 	['Maximize'],
 	 	['SpellChecker', 'Scayt'],		// 'Cut','Copy','Paste','-', are useless, can be done with right click, even on smarpthone
 	 	['Undo','Redo','-','Find','Replace'],
-	    ['Format','Font','FontSize'],
+	    ['Font','FontSize'],
 	 	['Bold','Italic','Underline','Strike','Superscript','-','TextColor','RemoveFormat'],
 	 	['NumberedList','BulletedList','Outdent','Indent'],
 	 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 96bf875bf3b..4285749aeab 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -22,6 +22,7 @@
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
 	--colortexttitlenotab2: rgb(<?php print $colortexttitlenotab2; ?>);
 	--colortexttitle: rgb(<?php print $colortexttitle; ?>);
+	--colortexttitlelink: rgb(<?php print $colortexttitlelink; ?>);
 	--colortext: rgb(<?php print $colortext; ?>);
 	--colortextlink: rgb(<?php print $colortextlink; ?>);
 	--colortextbackhmenu: #<?php echo $colortextbackhmenu; ?>;
@@ -143,7 +144,7 @@ table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.
 .liste_titre input[name=search_smonth], .liste_titre input[name=search_month], .liste_titre input[name=search_emonth], .liste_titre input[name=smonth], .liste_titre input[name=month], .liste_titre select[name=month],
 .liste_titre input[name=month_lim], .liste_titre input[name=month_start], .liste_titre input[name=month_end], .liste_titre input[name=month_create],
 .liste_titre input[name=search_month_lim], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end], .liste_titre input[name=search_month_create],
-.liste_titre input[name=search_month_create], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end],
+.liste_titre input[name=search_month_update], .liste_titre input[name=search_month_start], .liste_titre input[name=search_month_end],
 .liste_titre input[name=day_date_when], .liste_titre input[name=dayvalid], .liste_titre input[name=search_orderday], .liste_titre input[name=search_deliveryday],
 .liste_titre input[name=search_sday], .liste_titre input[name=search_day], .liste_titre input[name=search_eday], .liste_titre input[name=sday], .liste_titre input[name=day], .liste_titre select[name=day],
 .liste_titre input[name=day_lim], .liste_titre input[name=day_start], .liste_titre input[name=day_end], .liste_titre input[name=day_create],
@@ -510,7 +511,7 @@ form {
 form#addproduct {
     padding-top: 10px;
 }
-div.float
+div.float, span.floatleft
 {
     float:<?php print $left; ?>;
 }
@@ -713,7 +714,7 @@ textarea.centpercent {
 .longmessagecut {
     max-height: 250px;
     max-width: 100%;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 
 body[class*="colorblind-"] .text-warning{
@@ -1275,6 +1276,10 @@ table[summary="list_of_modules"] .fa-cog {
 	width: calc(100% - 50px) !important;
 	display: inline-block;
 }
+.widthcentpercentminusxx {
+	width: calc(100% - 70px) !important;
+	display: inline-block;
+}
 
 /* Force values for small screen 767 */
 @media only screen and (max-width: 767px)
@@ -1287,6 +1292,10 @@ table[summary="list_of_modules"] .fa-cog {
     	padding-right: 5px;
     }
 
+	div.divphotoref {
+	    padding-right: 10px !important;
+	}
+
     .hideonsmartphone { display: none; }
     .hideonsmartphoneimp { display: none !important; }
 
@@ -1298,15 +1307,10 @@ table[summary="list_of_modules"] .fa-cog {
 		margin-bottom: 15px !important;
 	}
 
-	select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth300 {
-		width: calc(100% - 50px) !important;
+	select.minwidth100imp, select.minwidth100, select.minwidth200, select.minwidth200imp, select.minwidth300 {
+		width: calc(100% - 40px) !important;
 		display: inline-block;
 	}
-
-	.clearbothonsmartphone { clear: both; display: block; }
-	/*img.photoref, div.photoref {
-		box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2);
-	}*/
 }
 
 /* Force values for small screen 570 */
@@ -1811,8 +1815,8 @@ td.nobordernopadding.widthpictotitle.col-picto {
     color: #999;
 }
 
+/*
 span.widthpictotitle.pictotitle {
-	/* background: rgba(70, 3, 62, 0.5); */
     background: var(--colortexttitlenotab);
     opacity: 0.8;
     color: #fff !important;
@@ -1821,10 +1825,12 @@ span.widthpictotitle.pictotitle {
     min-width: 30px;
     text-align: center;
 }
+*/
 .pictotitle {
 	margin-<?php echo $right; ?>: 8px;
 	/* margin-bottom: 4px; */
 }
+
 .pictoobjectwidth {
 	width: 14px;
 }
@@ -2402,7 +2408,8 @@ div.login_block a {
 	display: inline-block;
 }
 div.login_block span.aversion {
-	color: <?php echo colorAgressiveness($colortextbackhmenu, -40); ?>;
+	color: var(--colortextbackhmenu);
+	filter: contrast(0.7);
 }
 div.login_block table {
 	display: inline;
@@ -2448,7 +2455,7 @@ div.login_block_other {
 	height: 25px;
 }
 .atoplogin, .atoplogin:hover {
-	color: #<?php echo $colortextbackhmenu; ?> !important;
+	color: var(--colortextbackhmenu) !important;
 }
 .login_block_getinfo {
 	text-align: center;
@@ -2576,6 +2583,7 @@ font.vsmenudisabledmargin { margin: 1px 1px 1px 6px; }
 li a.vsmenudisabled, li.vsmenudisabled { color: #aaa !important; }
 
 a.help:link, a.help:visited, a.help:hover, a.help:active, span.help { text-align: <?php print $left; ?>; color: #aaa; text-decoration: none; }
+.helppresent, .helppresent:hover { color: #f3e4ac !important; }
 
 .vmenu div.blockvmenufirst, .vmenu div.blockvmenulogo, .vmenu div.blockvmenusearchphone, .vmenu div.blockvmenubookmarks
 {
@@ -2881,7 +2889,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 
 	border-right: 1px solid #CCC !important;
 	border-left: 1px solid #CCC !important;
-	/* border-top: <?php echo 2; ?>px solid rgb(<?php echo $colortopbordertitle1; ?>) !important; */
 	border-top: <?php echo 2; ?>px solid var(--colorbackhmenu1) !important;
 }
 a.tab:hover
@@ -3529,7 +3536,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
-	color: rgb(<?php echo $colortexttitlelink ?>);
+	color: var(--colortexttitlelink);
 }
 tr.liste_titre_topborder td {
 	border-top-width: <?php echo $borderwidth; ?>px;
@@ -3599,9 +3606,6 @@ table.tableforservicepart1 tr td {
 }
 
 .paymenttable, .margintable {
-	/*border-top-width: <?php echo $borderwidth ?>px !important;
-	border-top-color: rgb(<?php echo $colortopbordertitle1 ?>) !important;
-	border-top-style: solid !important;*/
 	border-top: none !important;
 	margin: 0px 0px 0px 0px !important;
 }
@@ -3755,6 +3759,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 
 @media only screen and (max-width: 767px)
 {
+	.tabBar .arearef .pagination.paginationref {
+	    max-width: calc(50%);
+	}
+
+	.clearbothonsmartphone {
+	    clear: both;
+	    display: block !important;
+	}
+
 	div.tabs {
 		padding-left: 0 !important;
 		padding-right: 0!important;
@@ -4985,9 +4998,14 @@ div.scroll2 {
 	width: <?php print isset($_SESSION['dol_screenwidth']) ?max($_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
-.gtaskname div, .gtaskname {
+div#GanttChartDIVglisthead, div#GanttChartDIVgcharthead {
+    line-height: 2;
+}
+
+.gtaskname div, .gtaskname, .gstartdate div, .gstartdate, .genddate div, .genddate {
 	font-size: unset !important;
 }
+
 div.gantt, .gtaskheading, .gmajorheading, .gminorheading, .gminorheadingwkend {
 	font-size: unset !important;
 	font-weight: normal !important;
@@ -5107,6 +5125,12 @@ div.ecmjqft {
 	right:4px;
 	clear: both;
 }
+#ecm-layout-north {
+	min-height: 40px;
+}
+#ecm-layout-north div.attachareaformuserfileecm {
+    padding-bottom: 0px;
+}
 div#ecm-layout-west {
     width: 380px;
     vertical-align: top;
@@ -5267,7 +5291,7 @@ span#select2-taskid-container[title^='--'] {
 
 .select2-container--default .select2-results__option--highlighted[aria-selected] {
     background-color: rgb(<?php echo $colorbackhmenu1 ?>);
-    color: #<?php echo $colortextbackhmenu; ?>;
+    color: var(--colortextbackhmenu);
 }
 .select2-container--default .select2-results__option--highlighted[aria-selected] span {
     color: #fff !important;
@@ -5306,6 +5330,9 @@ input.select2-input {
 {
     background-color: var(--colorbackvmenu1);
 }
+#blockvmenusearch .select2-container--default .select2-selection--single .select2-selection__placeholder {
+    color: var(--colortextbackvmenu);
+}
 .select2-container--default .select2-selection--single .select2-selection__rendered {
     color: var(--colortext);
     /* background-color: var(--colorbackvmenu1); */
@@ -5468,6 +5495,9 @@ a span.select2-chosen
 .select2-results {
 	max-height:	400px;
 }
+.select2-results__option {
+	word-break: break-word;
+}
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: var(--colorbackvmenu1);
 	background-image: none;
@@ -6361,6 +6391,9 @@ div.tabsElem a.tab {
 /* CSS style for debugbar                                                         */
 /* ============================================================================== */
 
+div.phpdebugbar * {
+	font-weight: unset;
+}
 span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-tooltip.phpdebugbar-tooltip-wide {
     width: 250px !important;
 }
@@ -6370,7 +6403,15 @@ span.phpdebugbar-tooltip.phpdebugbar-tooltip-extra-wide, span.phpdebugbar-toolti
 a.phpdebugbar-tab.phpdebugbar-active {
 	background-image: unset !important;
 }
-.phpdebugbar-indicator .fa {
+.phpdebugbar-fa-tags:before {
+    content: "\f121";
+    font-weight: 600 !important;
+}
+.phpdebugbar-fa-tasks:before {
+    content: "\f550";
+    font-weight: 600 !important;
+}
+.phpdebugbar-fa-tags, .phpdebugbar-fa-tasks, .phpdebugbar-indicator .fa {
 	font-family: "Font Awesome 5 Free";
 	font-weight: 600;
 }
diff --git a/htdocs/theme/eldy/img/object_intracommreport.png b/htdocs/theme/eldy/img/object_intracommreport.png
new file mode 100644
index 00000000000..08db8957e9b
Binary files /dev/null and b/htdocs/theme/eldy/img/object_intracommreport.png differ
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 8f189326ab3..0d3ee436bf4 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -315,14 +315,14 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO =
 .infobox-action{
 	color: #b06080 !important;
 }
-.infobox-propal,
-.infobox-facture,
-.infobox-commande{
+.infobox-propal:not(.pictotitle),
+.infobox-facture:not(.pictotitle),
+.infobox-commande:not(.pictotitle) {
 	color: #65955d !important;
 }
-.infobox-supplier_proposal,
-.infobox-invoice_supplier,
-.infobox-order_supplier{
+.infobox-supplier_proposal:not(.pictotitle),
+.infobox-invoice_supplier:not(.pictotitle),
+.infobox-order_supplier:not(.pictotitle){
 	color: #599caf !important;
 }
 .infobox-contrat, .infobox-ticket{
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index e89fdeec39f..fbccc810fe7 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -16,6 +16,9 @@
 	color: #<?php echo $colortextbackhmenu; ?>;
 }
 
+.fa-15x {
+    font-size: 1.5em;
+}
 
 div.mainmenu.menu {
 	background-image: none;
diff --git a/htdocs/theme/md/img/object_intracommreport.png b/htdocs/theme/md/img/object_intracommreport.png
new file mode 100644
index 00000000000..08db8957e9b
Binary files /dev/null and b/htdocs/theme/md/img/object_intracommreport.png differ
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index 2bca6430d0b..3aa45726975 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -16,7 +16,9 @@
 	color: #<?php echo $colortextbackhmenu; ?>;
 }
 
-
+.fa-15x {
+    font-size: 1.5em;
+}
 
 div.mainmenu.ticket::before {
     content: "\f3ff";
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index dcfbc402927..0be0b85bbbc 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -632,7 +632,7 @@ form {
     padding:0px;
     margin:0px;
 }
-div.float
+div.float, span.floatleft
 {
     float:<?php print $left; ?>;
 }
@@ -795,7 +795,7 @@ textarea.centpercent {
 .longmessagecut {
     max-height: 250px;
     max-width: 100%;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 
 .text-warning{
@@ -1269,6 +1269,15 @@ table[summary="list_of_modules"] .fa-cog {
     .minwidth500imp { min-width: 250px !important; }
 }
 
+.widthcentpercentminusx {
+	width: calc(100% - 50px) !important;
+	display: inline-block;
+}
+.widthcentpercentminusxx {
+	width: calc(100% - 70px) !important;
+	display: inline-block;
+}
+
 /* Force values for small screen 767 */
 @media only screen and (max-width: 767px)
 {
@@ -1279,7 +1288,9 @@ table[summary="list_of_modules"] .fa-cog {
 		font-size: <?php print is_numeric($fontsize) ? ($fontsize).'px' : $fontsize; ?> !important;
 	}
 
-	.clearbothonsmartphone { clear: both; display: block; }
+	div.divphotoref {
+	    padding-right: 10px !important;
+	}
 }
 
 /* Force values for small screen 570 */
@@ -3690,6 +3701,15 @@ ul.noborder li:nth-child(even):not(.liste_titre) {
 }
 @media only screen and (max-width: 767px)
 {
+	.tabBar .arearef .pagination.paginationref {
+	    max-width: calc(50%);
+	}
+
+	.clearbothonsmartphone {
+	    clear: both;
+	    display: block !important;
+	}
+
 	div.tabs {
 		padding-left: 0 !important;
 		margin-left: 0 !important;
@@ -4885,9 +4905,14 @@ div.scroll2 {
 	width: <?php print isset($_SESSION['dol_screenwidth']) ?max($_SESSION['dol_screenwidth'] - 830, 450) : '450'; ?>px !important;
 }
 
-.gtaskname div, .gtaskname {
+div#GanttChartDIVglisthead, div#GanttChartDIVgcharthead {
+    line-height: 2;
+}
+
+.gtaskname div, .gtaskname, .gstartdate div, .gstartdate, .genddate div, .genddate {
 	font-size: unset !important;
 }
+
 div.gantt, .gtaskheading, .gmajorheading, .gminorheading, .gminorheadingwkend {
 	font-size: unset !important;
 	font-weight: normal !important;
@@ -5327,6 +5352,9 @@ a span.select2-chosen
 .select2-results {
 	max-height:	400px;
 }
+.select2-results__option {
+	word-break: break-word;
+}
 .select2-container.select2-container-disabled .select2-choice, .select2-container-multi.select2-container-disabled .select2-choices {
 	background-color: #FFFFFF;
 	background-image: none;
@@ -6451,11 +6479,11 @@ if (is_object($db)) $db->close();
 ::-webkit-scrollbar {
 	width: 12px;
 }
-::-webkit-scrollbar-button {
-	background: #aaa;
-}
+/*::-webkit-scrollbar-button {
+	background: #bbb;
+}*/
 ::-webkit-scrollbar-track-piece {
-	background: #fff;
+	background: #f4f4f4;
 }
 ::-webkit-scrollbar-thumb {
 	background: #ddd;
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 1719013bdf5..1b23185a044 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -170,8 +170,12 @@ if (empty($reshook)) {
 			$object->message = GETPOST("message", 'restricthtml');
 
 			$object->type_code = GETPOST("type_code", 'alpha');
+			$object->type_label = $langs->trans($langs->getLabelFromKey($db, $object->type_code, 'c_ticket_type', 'code', 'label'));
 			$object->category_code = GETPOST("category_code", 'alpha');
+			$object->category_label = $langs->trans($langs->getLabelFromKey($db, $object->category_code, 'c_ticket_category', 'code', 'label'));
 			$object->severity_code = GETPOST("severity_code", 'alpha');
+			$object->severity_label = $langs->trans($langs->getLabelFromKey($db, $object->severity_code, 'c_ticket_severity', 'code', 'label'));
+			$object->email_from = $user->email;
 			$notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 			$object->notify_tiers_at_create = empty($notifyTiers) ? 0 : 1;
 
@@ -478,15 +482,18 @@ if (empty($reshook)) {
 			}
 
 			if ($action == 'setsubject' && empty($object->subject)) {
-				$mesg .= ($mesg ? '<br>' : '').$langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject"));
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")), null, 'errors');
 			}
 
-			if (!$mesg) {
+			if (!$error) {
 				if ($object->update($user) >= 0) {
 					header("Location: ".$_SERVER['PHP_SELF']."?track_id=".$object->track_id);
 					exit;
+				} else {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
-				$mesg = $object->error;
 			}
 		}
 	}
@@ -503,6 +510,9 @@ if (empty($reshook)) {
 					$url = 'card.php?action=view&track_id='.$object->track_id;
 					header("Location: ".$url);
 					exit();
+				} else {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			}
 		}
@@ -539,6 +549,9 @@ if (empty($reshook)) {
 				$log_action .= Diff::toString(Diff::compare(strip_tags($oldvalue_message), strip_tags($object->message)));
 
 				setEventMessages($langs->trans('TicketMessageSuccesfullyUpdated'), null, 'mesgs');
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 
@@ -556,6 +569,9 @@ if (empty($reshook)) {
 				$url = 'card.php?action=view&track_id='.$object->track_id;
 				header("Location: ".$url);
 				exit();
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	}
@@ -593,6 +609,9 @@ if (empty($reshook)) {
 			$log_action = $langs->trans('TicketLogPropertyChanged', $oldvalue_label, $newvalue_label);
 
 			setEventMessages($langs->trans('TicketUpdated'), null, 'mesgs');
+		} else {
+			$error++;
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 		$action = 'view';
 	}
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 9076a236978..391bd4dce2d 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -142,6 +142,26 @@ class Ticket extends CommonObject
 	 */
 	public $severity_code;
 
+    /**
+     * Type label
+     */
+    public $type_label;
+
+    /**
+     * Category label
+     */
+    public $category_label;
+
+    /**
+     * Severity label
+     */
+    public $severity_label;
+
+        /**
+     * Email from user
+     */
+    public $email_from;
+
 	/**
 	 * @var int Création date
 	 */
@@ -237,7 +257,7 @@ class Ticket extends CommonObject
 		'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'help'=>""),
 		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>1, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
 		'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>1, 'enabled'=>1, 'position'=>501, 'notnull'=>1),
-		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1),
+		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1, 'css'=>'tdoverflowmax150'),
 		'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>520, 'notnull'=>1),
 		'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
@@ -1467,7 +1487,7 @@ class Ticket extends CommonObject
 				$message .= $langs->transnoentities('TicketNotificationRecipient').' : '.$recipient."\n";
 				$message .= "\n";
 				$message .= '* '.$langs->transnoentities('TicketNotificationLogMessage').' *'."\n";
-				$message .= dol_html_entity_decode($log_message, ENT_QUOTES)."\n";
+				$message .= dol_html_entity_decode($log_message, ENT_QUOTES|ENT_HTML5)."\n";
 
 				if ($info_sendto['source'] == 'internal') {
 					$url_internal_ticket = dol_buildpath('/ticket/card.php', 2).'?track_id='.$this->track_id;
@@ -2937,6 +2957,21 @@ class Ticket extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB 	$db 			Database handler
+	 * @param int 		$origin_id 		Old thirdparty id
+	 * @param int 		$dest_id 		New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty($db, $origin_id, $dest_id)
+	{
+		$tables = array('ticket');
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index a6d9ad3d0b0..5e2d8587dd0 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -289,7 +289,9 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 $max = 10;
 
 $sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.type_code, t.category_code, t.severity_code, t.fk_statut, t.progress,";
-$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
+$sql .= " type.code as type_code, type.label as type_label,";
+$sql .= " category.code as category_code, category.label as category_label,";
+$sql .= " severity.code as severity_code, severity.label as severity_label";
 $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
@@ -358,18 +360,23 @@ if ($result) {
             print "</td>\n";
 
             // Type
-            print '<td class="nowrap">';
-            print $objp->type_label;
+            print '<td class="nowrap tdoverflowmax100">';
+            $s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$objp->type_code, 'c_ticket_type', 'code', 'label', $objp->type_code);
+            print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
             print '</td>';
 
             // Category
             print '<td class="nowrap">';
-            print $objp->category_label;
+            $s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
+            print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+            //print $objp->category_label;
             print "</td>";
 
             // Severity
             print '<td class="nowrap">';
-            print $objp->severity_label;
+            $s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$objp->severity_code, 'c_ticket_severity', 'code', 'label', $objp->severity_code);
+            print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+            //print $objp->severity_label;
             print "</td>";
 
             print '<td class="nowraponall right">';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index d3521b6f5a0..93f8cd1ea8f 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -663,7 +663,7 @@ foreach ($object->fields as $key => $val)
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'"><input type="text" class="flat maxwidth75" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
 		} else {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+			if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 			elseif (strpos($val['type'], 'integer:') === 0) {
 				print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
 			} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -765,8 +765,18 @@ while ($i < min($num, $limit))
 				print $s;
 				print '</span>';
 			}
-			elseif ($key == 'category_code') print $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
-			elseif ($key == 'severity_code') print $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
+			elseif ($key == 'category_code') {
+				$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code);
+				print '<span title="'.$s.'">';
+				print $s;
+				print '</span>';
+			}
+			elseif ($key == 'severity_code') {
+				$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code);
+				print '<span title="'.$s.'">';
+				print $s;
+				print '</span>';
+			}
 			elseif ($key == 'tms') print dol_print_date($db->jdate($obj->$key), 'dayhour', 'tzuser');
 			elseif ($key == 'fk_user_create') {
 				if ($object->fk_user_create > 0) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 95a60804cfb..fcd3a4d21b5 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1446,8 +1446,10 @@ if ($action == 'create' || $action == 'adduserldap')
 			}
 			if (preg_match('/dolibarr/', $dolibarr_main_authentication))
 			{
-				if ($object->pass) $valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
-				else {
+				if ($object->pass) {
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
+					$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+				} else {
 					if ($user->admin && $user->id == $object->id) {
 						$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '');
 						//$valuetoshow .= '<span class="opacitymedium">'.$langs->trans("Crypted").' - </span>';
@@ -1755,22 +1757,28 @@ if ($action == 'create' || $action == 'adduserldap')
 			{
 				print '<tr><td>'.$langs->trans("LinkToCompanyContact").'</td>';
 				print '<td>';
+				$s = '';
 				if (isset($object->socid) && $object->socid > 0)
 				{
 					$societe = new Societe($db);
 					$societe->fetch($object->socid);
-					print $societe->getNomUrl(1, '');
+					if ($societe->id > 0){
+						$s .= $societe->getNomUrl(1, '');
+					}
 				} else {
-					print $langs->trans("ThisUserIsNot");
+					$s .= $langs->trans("ThisUserIsNot");
 				}
 				if (!empty($object->contact_id))
 				{
 					$contact = new Contact($db);
 					$contact->fetch($object->contact_id);
-					if ($object->socid > 0) print ' / ';
-					else print '<br>';
-					print $contact->getNomUrl(1, '');
+					if ($contact->id > 0) {
+						if ($object->socid > 0 && $s) $s .= ' / ';
+						else $s .= '<br>';
+						$s .= $contact->getNomUrl(1, '');
+					}
 				}
+				print $s;
 				print '</td>';
 				print '</tr>'."\n";
 			}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 923102f6df5..1649032fc8d 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -170,7 +170,7 @@ class User extends CommonObject
 
 	public $users = array(); // To store all tree of users hierarchy
 	public $parentof; // To store an array of all parents for all ids.
-	private $cache_childids;	// Cache array of already loaded childs
+	private $cache_childids; // Cache array of already loaded childs
 
 	public $accountancy_code; // Accountancy code in prevision of the complete accountancy module
 
@@ -704,10 +704,10 @@ class User extends CommonObject
 			// avoid admin can remove his own important rights
 			if ($this->admin == 1)
 			{
-				$sql .= " AND id NOT IN (251, 252, 253, 254, 255, 256)";	// other users rights
-				$sql .= " AND id NOT IN (341, 342, 343, 344)";				// own rights
-				$sql .= " AND id NOT IN (351, 352, 353, 354)";				// groups rights
-				$sql .= " AND id NOT IN (358)";								// user export
+				$sql .= " AND id NOT IN (251, 252, 253, 254, 255, 256)"; // other users rights
+				$sql .= " AND id NOT IN (341, 342, 343, 344)"; // own rights
+				$sql .= " AND id NOT IN (351, 352, 353, 354)"; // groups rights
+				$sql .= " AND id NOT IN (358)"; // user export
 			}
 
 			$result = $this->db->query($sql);
@@ -1186,7 +1186,7 @@ class User extends CommonObject
 						return -5;
 					}
 
-					if (! empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE))
+					if (!empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER) && !empty($conf->global->STOCK_USERSTOCK_AUTOCREATE))
 					{
 						require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 						$langs->load("stocks");
@@ -1318,7 +1318,8 @@ class User extends CommonObject
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Create a user into database from a member object
+	 *  Create a user into database from a member object.
+	 *  If $member->fk_soc is set, it will be an external user.
 	 *
 	 *  @param	Adherent	$member		Object member source
 	 * 	@param	string		$login		Login to force
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 0bed08c3c31..d02d647f96d 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -220,7 +220,7 @@ if (empty($reshook))
 		$search_date_creation = "";
 		$search_date_update = "";
 		$search_array_options = array();
-        $search_categ = 0;
+		$search_categ = 0;
 	}
 
 	// Mass actions
@@ -463,11 +463,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 if (!empty($catid))
 {
-    print "<div id='ways'>";
-    $c = new Categorie($db);
-    $ways = $c->print_all_ways(' &gt; ', 'user/list.php');
-    print " &gt; ".$ways[0]."<br>\n";
-    print "</div><br>";
+	print "<div id='ways'>";
+	$c = new Categorie($db);
+	$ways = $c->print_all_ways(' &gt; ', 'user/list.php');
+	print " &gt; ".$ways[0]."<br>\n";
+	print "</div><br>";
 }
 
 if ($search_all)
@@ -482,12 +482,12 @@ $moreforfilter = '';
  $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (!empty($conf->categorie->enabled))
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire)
 {
-    $moreforfilter .= '<div class="divsearchfield">';
-    $moreforfilter .= $langs->trans('Categories').': ';
-    $moreforfilter .= $formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1);
-    $moreforfilter .= '</div>';
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= $langs->trans('Categories').': ';
+	$moreforfilter .= $formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1);
+	$moreforfilter .= '</div>';
 }
 
 $parameters = array();
@@ -497,9 +497,9 @@ else $moreforfilter = $hookmanager->resPrint;
 
 if (!empty($moreforfilter))
 {
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print $moreforfilter;
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
@@ -693,29 +693,29 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	}
 	if (!empty($arrayfields['u.firstname']['checked']))
 	{
-	    print '<td class="tdoverflowmax150">'.$obj->firstname.'</td>';
+		print '<td class="tdoverflowmax150">'.$obj->firstname.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.gender']['checked']))
 	{
-	    print '<td>';
-	    if ($obj->gender) print $langs->trans("Gender".$obj->gender);
-	    print '</td>';
+		print '<td>';
+		if ($obj->gender) print $langs->trans("Gender".$obj->gender);
+		print '</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.employee']['checked']))
 	{
-	    print '<td>'.yn($obj->employee).'</td>';
+		print '<td>'.yn($obj->employee).'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.accountancy_code']['checked']))
 	{
-	    print '<td>'.$obj->accountancy_code.'</td>';
+		print '<td>'.$obj->accountancy_code.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.email']['checked']))
 	{
-	    print '<td>'.$obj->email.'</td>';
+		print '<td>'.$obj->email.'</td>';
 		if (!$i) $totalarray['nbfield']++;
 	}
 	if (!empty($arrayfields['u.api_key']['checked']))
@@ -774,7 +774,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 			$user2->admin = $obj->admin2;
 			$user2->email = $obj->email2;
 			$user2->socid = $obj->fk_soc2;
-            $user2->statut = $obj->statut2;
+			$user2->statut = $obj->statut2;
 			print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
 			if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2)
 			{
@@ -826,9 +826,9 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	// Status
 	if (!empty($arrayfields['u.statut']['checked']))
 	{
-	    $userstatic->statut = $obj->statut;
-	    print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
-	    if (!$i) $totalarray['nbfield']++;
+		$userstatic->statut = $obj->statut;
+		print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
+		if (!$i) $totalarray['nbfield']++;
 	}
 	// Action column
 	print '<td class="nowrap center">';
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 955c1f14599..a0c3c160de7 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -64,7 +64,7 @@ if (empty($reshook)) {
 	if ($action == 'update' && $user->rights->user->user->creer && !$_POST["cancel"]) {
 		$db->begin();
 
-		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES));
+		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES|ENT_HTML5));
 		if ($res < 0) {
 			$mesg = '<div class="error">'.$adh->error.'</div>';
 			$db->rollback();
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index ca90e7f60e9..9d4b5e7a331 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -63,48 +63,48 @@ $now = dol_now();
 // Add a notification
 if ($action == 'add')
 {
-    $error = 0;
+	$error = 0;
 
-    if ($actionid <= 0)
-    {
-	    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
-        $error++;
-    }
+	if ($actionid <= 0)
+	{
+		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Action")), null, 'errors');
+		$error++;
+	}
 
-    if (!$error)
-    {
-        $db->begin();
+	if (!$error)
+	{
+		$db->begin();
 
-        $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
-        $sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;
-        if ($db->query($sql))
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";
-            $sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def";
+		$sql .= " WHERE fk_user=".$id." AND fk_action=".$actionid;
+		if ($db->query($sql))
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."notify_def (datec,fk_user, fk_action)";
+			$sql .= " VALUES ('".$db->idate($now)."',".$id.",".$actionid.")";
 
-            if (!$db->query($sql))
-            {
-                $error++;
-                dol_print_error($db);
-            }
-        } else {
-            dol_print_error($db);
-        }
+			if (!$db->query($sql))
+			{
+				$error++;
+				dol_print_error($db);
+			}
+		} else {
+			dol_print_error($db);
+		}
 
-        if (!$error)
-        {
-            $db->commit();
-        } else {
-            $db->rollback();
-        }
-    }
+		if (!$error)
+		{
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
 }
 
 // Remove a notification
 if ($action == 'delete')
 {
-    $sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");
-    $db->query($sql);
+	$sql = "DELETE FROM ".MAIN_DB_PREFIX."notify_def where rowid=".GETPOST("actid", "int");
+	$db->query($sql);
 }
 
 
@@ -127,32 +127,32 @@ llxHeader('', $title, $help_url);
 
 if ($result > 0)
 {
-    $langs->load("other");
+	$langs->load("other");
 
-    $head = user_prepare_head($object);
+	$head = user_prepare_head($object);
 
-    dol_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');
+	dol_fiche_head($head, 'notify', $langs->trans("User"), -1, 'user');
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-    dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');
 
-    print '<div class="fichecenter">';
+	print '<div class="fichecenter">';
 
-    print '<div class="underbanner clearboth"></div>';
-    print '<table class="border centpercent tableforfield">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
 
-    // Login
-    print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
-    if (!empty($object->ldap_sid) && $object->statut == 0)
-    {
-        print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
-    } else {
-        print '<td>'.$object->login.'</td>';
-    }
-    print '</tr>'."\n";
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+	if (!empty($object->ldap_sid) && $object->statut == 0)
+	{
+		print '<td class="error">'.$langs->trans("LoginAccountDisableInDolibarr").'</td>';
+	} else {
+		print '<td>'.$object->login.'</td>';
+	}
+	print '</tr>'."\n";
 
-    /*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
     print '<td colspan="3">';
     $nbofrecipientemails=0;
     $notify=new Notify($db);
@@ -164,164 +164,164 @@ if ($result > 0)
     print $nbofrecipientemails;
     print '</td></tr>';*/
 
-    print '</table>';
+	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
-    print "\n";
+	print "\n";
 
-    // Help
-    print '<span class="opacitymedium">';
-    print '<br>'.$langs->trans("NotificationsDesc");
-    print '<br>'.$langs->trans("NotificationsDescUser");
-    print '<br>'.$langs->trans("NotificationsDescContact");
-    print '<br>'.$langs->trans("NotificationsDescGlobal");
-    print '</span>';
+	// Help
+	print '<span class="opacitymedium">';
+	print '<br>'.$langs->trans("NotificationsDesc");
+	print '<br>'.$langs->trans("NotificationsDescUser");
+	print '<br>'.$langs->trans("NotificationsDescContact");
+	print '<br>'.$langs->trans("NotificationsDescGlobal");
+	print '</span>';
 
-    print '<br><br><br>'."\n";
+	print '<br><br><br>'."\n";
 
 
-    // Add notification form
-    print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
+	// Add notification form
+	print load_fiche_titre($langs->trans("AddNewNotification"), '', '');
 
-    print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="action" value="add">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$id.'" method="post">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="add">';
 
-    $param = "&id=".$id;
+	$param = "&id=".$id;
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('');
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('');
 	print "</tr>\n";
 
 
-    // $listofemails=$object->thirdparty_and_contact_email_array();
-    if ($object->email)
-    {
-        $actions = array();
+	// $listofemails=$object->thirdparty_and_contact_email_array();
+	if ($object->email)
+	{
+		$actions = array();
 
-        // Load array of available notifications
-        $notificationtrigger = new InterfaceNotification($db);
-        $listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();
+		// Load array of available notifications
+		$notificationtrigger = new InterfaceNotification($db);
+		$listofnotifiedevents = $notificationtrigger->getListOfManagedEvents();
 
-        foreach ($listofnotifiedevents as $notifiedevent)
-        {
+		foreach ($listofnotifiedevents as $notifiedevent)
+		{
  			$label = ($langs->trans("Notify_".$notifiedevent['code']) != "Notify_".$notifiedevent['code'] ? $langs->trans("Notify_".$notifiedevent['code']) : $notifiedevent['label']);
-            $actions[$notifiedevent['rowid']] = $label;
-        }
-        print '<tr class="oddeven nohover"><td>';
-        print $object->getNomUrl(1);
-        if (isValidEmail($object->email))
-        {
-            print ' &lt;'.$object->email.'&gt;';
-        } else {
-            $langs->load("errors");
-            print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
-        }
-        print '</td>';
-        print '<td>';
-        print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);
-        print '</td>';
-        print '<td>';
-        $type = array('email'=>$langs->trans("EMail"));
-        print $form->selectarray("typeid", $type);
-        print '</td>';
-        print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
-        print '</tr>';
-    } else {
-        print '<tr class="oddeven"><td colspan="4">';
-        print $langs->trans("YouMustAssignUserMailFirst");
-        print '</td></tr>';
-    }
+			$actions[$notifiedevent['rowid']] = $label;
+		}
+		print '<tr class="oddeven nohover"><td>';
+		print $object->getNomUrl(1);
+		if (isValidEmail($object->email))
+		{
+			print ' &lt;'.$object->email.'&gt;';
+		} else {
+			$langs->load("errors");
+			print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $object->email);
+		}
+		print '</td>';
+		print '<td>';
+		print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$form->selectarray("actionid", $actions, '', 1);
+		print '</td>';
+		print '<td>';
+		$type = array('email'=>$langs->trans("EMail"));
+		print $form->selectarray("typeid", $type);
+		print '</td>';
+		print '<td class="right"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
+		print '</tr>';
+	} else {
+		print '<tr class="oddeven"><td colspan="4">';
+		print $langs->trans("YouMustAssignUserMailFirst");
+		print '</td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
-    print '<br>';
+	print '</form>';
+	print '<br>';
 
-    // List of notifications enabled for contacts
-    $sql = "SELECT n.rowid, n.type,";
-    $sql .= " a.code, a.label,";
-    $sql .= " c.rowid as userid, c.lastname, c.firstname, c.email";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
-    $sql .= " ".MAIN_DB_PREFIX."user c";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND c.rowid = n.fk_user";
-    $sql .= " AND c.rowid = ".$object->id;
+	// List of notifications enabled for contacts
+	$sql = "SELECT n.rowid, n.type,";
+	$sql .= " a.code, a.label,";
+	$sql .= " c.rowid as userid, c.lastname, c.firstname, c.email";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify_def as n,";
+	$sql .= " ".MAIN_DB_PREFIX."user c";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND c.rowid = n.fk_user";
+	$sql .= " AND c.rowid = ".$object->id;
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    } else {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    // List of active notifications
-    print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
+	// List of active notifications
+	print load_fiche_titre($langs->trans("ListOfActiveNotifications").' ('.$num.')', '', '');
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
-    print_liste_field_titre('', '', '');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '"width="45%"', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '"width="35%"', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '"width="10%"', $sortfield, $sortorder);
+	print_liste_field_titre('', '', '');
+	print '</tr>';
 
 	$langs->load("errors");
 	$langs->load("other");
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $userstatic = new user($db);
+		$userstatic = new user($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            $userstatic->id = $obj->userid;
-            $userstatic->lastname = $obj->lastname;
-            $userstatic->firstname = $obj->firstname;
-            print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);
-            if ($obj->type == 'email')
-            {
-                if (isValidEmail($obj->email))
-                {
-                    print ' &lt;'.$obj->email.'&gt;';
-                } else {
-                    $langs->load("errors");
-                    print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
-                }
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("SMS");
-            print '</td>';
-            print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
+			$userstatic->id = $obj->userid;
+			$userstatic->lastname = $obj->lastname;
+			$userstatic->firstname = $obj->firstname;
+			print '<tr class="oddeven"><td>'.$userstatic->getNomUrl(1);
+			if ($obj->type == 'email')
+			{
+				if (isValidEmail($obj->email))
+				{
+					print ' &lt;'.$obj->email.'&gt;';
+				} else {
+					$langs->load("errors");
+					print ' &nbsp; '.img_warning().' '.$langs->trans("ErrorBadEMail", $obj->email);
+				}
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print img_picto('', 'object_action', '', false, 0, 0, '', 'paddingright').$label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("SMS");
+			print '</td>';
+			print '<td class="right"><a href="card.php?id='.$id.'&amp;action=delete&amp;token='.newToken().'&amp;actid='.$obj->rowid.'">'.img_delete().'</a></td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
 	}
 
-    // List of notifications enabled for fixed email
-    /*
+	// List of notifications enabled for fixed email
+	/*
     foreach($conf->global as $key => $val)
     {
     	if (! preg_match('/^NOTIFICATION_FIXEDEMAIL_(.*)/', $key, $reg)) continue;
@@ -362,7 +362,7 @@ if ($result > 0)
 		print '<td class="right">'.$langs->trans("SeeModuleSetup", $langs->transnoentitiesnoconv("Module600Name")).'</td>';
 		print '</tr>';
     }*/
-    /*if ($user->admin)
+	/*if ($user->admin)
     {
 	    $var = ! $var;
 		print '<tr class="oddeven"><td colspan="4">';
@@ -370,104 +370,104 @@ if ($result > 0)
 		print '</td></tr>';
     }*/
 
-    print '</table>';
+	print '</table>';
 
 
-    print '<br><br>'."\n";
+	print '<br><br>'."\n";
 
 
-    // List
-    $sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
-    $sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
-    $sql .= " a.code, a.label";
-    $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
-    $sql .= " ".MAIN_DB_PREFIX."notify as n";
-    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";
-    $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND n.fk_user = ".$object->id;
-    $sql .= $db->order($sortfield, $sortorder);
+	// List
+	$sql = "SELECT n.rowid, n.daten, n.email, n.objet_type as object_type, n.objet_id as object_id, n.type,";
+	$sql .= " c.rowid as id, c.lastname, c.firstname, c.email as contactemail,";
+	$sql .= " a.code, a.label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger as a,";
+	$sql .= " ".MAIN_DB_PREFIX."notify as n";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as c ON n.fk_user = c.rowid";
+	$sql .= " WHERE a.rowid = n.fk_action";
+	$sql .= " AND n.fk_user = ".$object->id;
+	$sql .= $db->order($sortfield, $sortorder);
 
-    // Count total nb of records
-    $nbtotalofrecords = '';
-    if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
-    {
-        $result = $db->query($sql);
-        $nbtotalofrecords = $db->num_rows($result);
-        if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
-        {
-        	$page = 0;
-        	$offset = 0;
-        }
-    }
+	// Count total nb of records
+	$nbtotalofrecords = '';
+	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST))
+	{
+		$result = $db->query($sql);
+		$nbtotalofrecords = $db->num_rows($result);
+		if (($page * $limit) > $nbtotalofrecords)	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		{
+			$page = 0;
+			$offset = 0;
+		}
+	}
 
-    $sql .= $db->plimit($limit + 1, $offset);
+	$sql .= $db->plimit($limit + 1, $offset);
 
-    $resql = $db->query($sql);
-    if ($resql)
-    {
-        $num = $db->num_rows($resql);
-    } else {
-        dol_print_error($db);
-    }
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
 
-    $param = '&id='.$object->id;
-    if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
-    if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
+	$param = '&id='.$object->id;
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.$contextpage;
+	if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.$limit;
 
-    print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
-    if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
-    print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-    print '<input type="hidden" name="page" value="'.$page.'">';
-    print '<input type="hidden" name="id" value="'.$object->id.'">';
+	print '<form method="post" action="'.$_SERVER["PHP_SELF"].'" name="formfilter">';
+	if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="page" value="'.$page.'">';
+	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-    // List of notifications done
-    print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
+	// List of notifications done
+	print_barre_liste($langs->trans("ListOfNotificationsDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '', 0, '', '', $limit);
 
-    // Line with titles
-    print '<table width="100%" class="noborder">';
-    print '<tr class="liste_titre">';
-    print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
-    print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
-    //print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
-    print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
-    print '</tr>';
+	// Line with titles
+	print '<table width="100%" class="noborder">';
+	print '<tr class="liste_titre">';
+	print_liste_field_titre("Target", $_SERVER["PHP_SELF"], "c.lastname,c.firstname", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "n.type", '', $param, '', $sortfield, $sortorder);
+	//print_liste_field_titre("Object",$_SERVER["PHP_SELF"],"",'',$param,'"',$sortfield,$sortorder);
+	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "n.daten", '', $param, '', $sortfield, $sortorder, 'right ');
+	print '</tr>';
 
-    if ($num)
-    {
-        $i = 0;
+	if ($num)
+	{
+		$i = 0;
 
-        $userstatic = new User($db);
+		$userstatic = new User($db);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
 
-            print '<tr class="oddeven"><td>';
-            if ($obj->id > 0)
-            {
-	            $userstatic->id = $obj->id;
-	            $userstatic->lastname = $obj->lastname;
-	            $userstatic->firstname = $obj->firstname;
-	            print $userstatic->getNomUrl(1);
-	            print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
-            } else {
+			print '<tr class="oddeven"><td>';
+			if ($obj->id > 0)
+			{
+				$userstatic->id = $obj->id;
+				$userstatic->lastname = $obj->lastname;
+				$userstatic->firstname = $obj->firstname;
+				print $userstatic->getNomUrl(1);
+				print $obj->email ? ' &lt;'.$obj->email.'&gt;' : $langs->trans("NoMail");
+			} else {
 				print $obj->email;
-            }
-            print '</td>';
-            print '<td>';
-            $label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
-            print $label;
-            print '</td>';
-            print '<td>';
-            if ($obj->type == 'email') print $langs->trans("Email");
-            if ($obj->type == 'sms') print $langs->trans("Sms");
-            print '</td>';
-            // TODO Add link to object here for other types
-            /*print '<td>';
+			}
+			print '</td>';
+			print '<td>';
+			$label = ($langs->trans("Notify_".$obj->code) != "Notify_".$obj->code ? $langs->trans("Notify_".$obj->code) : $obj->label);
+			print $label;
+			print '</td>';
+			print '<td>';
+			if ($obj->type == 'email') print $langs->trans("Email");
+			if ($obj->type == 'sms') print $langs->trans("Sms");
+			print '</td>';
+			// TODO Add link to object here for other types
+			/*print '<td>';
             if ($obj->object_type == 'order')
             {
 				$orderstatic->id=$obj->object_id;
@@ -475,19 +475,19 @@ if ($result > 0)
 				print $orderstatic->getNomUrl(1);
             }
            	print '</td>';*/
-            // print
-            print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
-            print '</tr>';
-            $i++;
-        }
-        $db->free($resql);
-    } else {
-    	print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-    }
+			// print
+			print'<td class="right">'.dol_print_date($db->jdate($obj->daten), 'dayhour').'</td>';
+			print '</tr>';
+			$i++;
+		}
+		$db->free($resql);
+	} else {
+		print '<tr><td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+	}
 
-    print '</table>';
+	print '</table>';
 
-    print '</form>';
+	print '</form>';
 } else dol_print_error('', 'RecordNotFound');
 
 // End of page
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 8e9584a86ac..d92c8690094 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -52,8 +52,8 @@ class WebsitePage extends CommonObject
 
 
 	/**
-     * @var int ID
-     */
+	 * @var int ID
+	 */
 	public $fk_website;
 
 	public $pageurl;
@@ -106,14 +106,14 @@ class WebsitePage extends CommonObject
 	public $author_alias;
 
    	/**
-     * @var string path of external object
-     */
-    public $object_type;
+   	 * @var string path of external object
+   	 */
+	public $object_type;
 
-    /**
-     * @var string id of external object
-     */
-    public $fk_object;
+	/**
+	 * @var string id of external object
+	 */
+	public $fk_object;
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
@@ -145,25 +145,25 @@ class WebsitePage extends CommonObject
 
 	// BEGIN MODULEBUILDER PROPERTIES
 	/**
-     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-     */
+	 * @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(
-	    'rowid'          =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
+		'rowid'          =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
 		'pageurl'        =>array('type'=>'varchar(16)', 'label'=>'WEBSITE_PAGENAME', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Ref/alias of page'),
 		'aliasalt'       =>array('type'=>'varchar(255)', 'label'=>'AliasAlt', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>0, 'position'=>11, 'searchall'=>0, 'comment'=>'Alias alternative of page'),
 		'type_container' =>array('type'=>'varchar(16)', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'index'=>0, 'position'=>12, 'comment'=>'Type of container'),
 		'title'          =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'help'=>'UseTextBetween5And70Chars'),
-	    'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
+		'description'    =>array('type'=>'varchar(255)', 'label'=>'Description', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1),
 		'image'          =>array('type'=>'varchar(255)', 'label'=>'Image', 'enabled'=>1, 'visible'=>1, 'position'=>32, 'searchall'=>0, 'help'=>'Relative path of media. Used if Type is "blogpost"'),
 		'keywords'       =>array('type'=>'varchar(255)', 'label'=>'Keywords', 'enabled'=>1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		'lang'           =>array('type'=>'varchar(6)', 'label'=>'Lang', 'enabled'=>1, 'notnull'=>-1, 'visible'=>1, 'position'=>45, 'searchall'=>0),
 		//'status'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'index'=>true,   'position'=>1000),
-	    'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
-	    'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),
-	    'htmlheader'     =>array('type'=>'text', 'label'=>'HtmlHeader', 'enabled'=>1, 'visible'=>0, 'position'=>50, 'searchall'=>0),
-	    'content'        =>array('type'=>'mediumtext', 'label'=>'Content', 'enabled'=>1, 'visible'=>0, 'position'=>51, 'searchall'=>0),
+		'fk_website'     =>array('type'=>'integer', 'label'=>'WebsiteId', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'position'=>40, 'searchall'=>0, 'foreignkey'=>'websitepage.rowid'),
+		'fk_page'        =>array('type'=>'integer', 'label'=>'ParentPageId', 'enabled'=>1, 'visible'=>1, 'notnull'=>-1, 'position'=>45, 'searchall'=>0, 'foreignkey'=>'website.rowid'),
+		'htmlheader'     =>array('type'=>'text', 'label'=>'HtmlHeader', 'enabled'=>1, 'visible'=>0, 'position'=>50, 'searchall'=>0),
+		'content'        =>array('type'=>'mediumtext', 'label'=>'Content', 'enabled'=>1, 'visible'=>0, 'position'=>51, 'searchall'=>0),
 		'grabbed_from'   =>array('type'=>'varchar(255)', 'label'=>'GrabbedFrom', 'enabled'=>1, 'visible'=>1, 'index'=>1, 'position'=>400, 'comment'=>'URL page content was grabbed from'),
-	    'date_creation'  =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
+		'date_creation'  =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>500),
 		'tms'            =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>501),
 		//'date_valid'    =>array('type'=>'datetime',     'label'=>'DateValidation',     'enabled'=>1, 'visible'=>-1, 'position'=>502),
 		'fk_user_creat'  =>array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>true, 'position'=>510),
@@ -172,7 +172,7 @@ class WebsitePage extends CommonObject
 		//'fk_user_valid' =>array('type'=>'integer',      'label'=>'UserValidation',        'enabled'=>1, 'visible'=>-1, 'position'=>512),
 		'import_key'     =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-1, 'index'=>1, 'position'=>1000, 'notnull'=>-1),
 		'object_type' => array('type' => 'varchar(255)','label' => 'ObjectType', 'enabled'=>1, 'visible'=>1, 'position'=>46, 'searchall'=>0, 'help'=>''),
-	    'fk_object' => array('type' => 'varchar(255)','label' => 'ObjectId', 'enabled'=>1, 'visible'=>1, 'position'=>47, 'searchall'=>0, 'help'=>'')
+		'fk_object' => array('type' => 'varchar(255)','label' => 'ObjectId', 'enabled'=>1, 'visible'=>1, 'position'=>47, 'searchall'=>0, 'help'=>'')
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -274,7 +274,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_user_modif,";
 		$sql .= " t.import_key,";
 		$sql .= " t.object_type,";
-        $sql .= " t.fk_object";
+		$sql .= " t.fk_object";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		//$sql .= ' WHERE entity IN ('.getEntity('website').')';       // entity is on website level
 		$sql .= ' WHERE 1 = 1';
@@ -285,22 +285,22 @@ class WebsitePage extends CommonObject
 		else {
 			if ($id < 0) $sql .= ' AND t.rowid <> '.abs($id);
 			if (null !== $website_id) {
-			    $sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
-			    if ($page) {
-			    	$pagetouse = $page;
-			    	$langtouse = '';
-			    	$tmppage = explode('/', $page);
-			    	if (!empty($tmppage[1])) {
-			    		$pagetouse = $tmppage[1];
-			    		if (strlen($tmppage[0])) $langtouse = $tmppage[0];
-			    	}
-			    	$sql .= " AND t.pageurl = '".$this->db->escape($pagetouse)."'";
-			    	if ($langtouse) $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
-			    }
-			    if ($aliasalt)	$sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
+				$sql .= " AND t.fk_website = '".$this->db->escape($website_id)."'";
+				if ($page) {
+					$pagetouse = $page;
+					$langtouse = '';
+					$tmppage = explode('/', $page);
+					if (!empty($tmppage[1])) {
+						$pagetouse = $tmppage[1];
+						if (strlen($tmppage[0])) $langtouse = $tmppage[0];
+					}
+					$sql .= " AND t.pageurl = '".$this->db->escape($pagetouse)."'";
+					if ($langtouse) $sql .= " AND t.lang = '".$this->db->escape($langtouse)."'";
+				}
+				if ($aliasalt)	$sql .= " AND (t.aliasalt LIKE '%,".$this->db->escape($aliasalt).",%' OR t.aliasalt LIKE '%, ".$this->db->escape($aliasalt).",%')";
 			}
 		}
-        $sql .= $this->db->plimit(1);
+		$sql .= $this->db->plimit(1);
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -334,7 +334,7 @@ class WebsitePage extends CommonObject
 				$this->fk_user_modif = $obj->fk_user_modif;
 				$this->import_key = $obj->import_key;
 				$this->object_type = $obj->object_type;
-                $this->fk_object = $obj->fk_object;
+				$this->fk_object = $obj->fk_object;
 			}
 			$this->db->free($resql);
 
@@ -392,7 +392,7 @@ class WebsitePage extends CommonObject
 		$sql .= " t.fk_user_modif,";
 		$sql .= " t.import_key,";
 		$sql .= " t.object_type,";
-        $sql .= " t.fk_object";
+		$sql .= " t.fk_object";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.fk_website = '.$websiteid;
 		// Manage filter
@@ -619,7 +619,7 @@ class WebsitePage extends CommonObject
 			}
 		}
 
-		if (! $error) {
+		if (!$error) {
 			return 1;
 		} else {
 			return -1;
@@ -712,43 +712,43 @@ class WebsitePage extends CommonObject
 	 *
 	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option				On what the link point to
-     *  @param	integer	$notooltip			1=Disable tooltip
-     *  @param	int		$maxlen				Max length of visible user name
-     *  @param  string  $morecss            Add more css on link
+	 *  @param	integer	$notooltip			1=Disable tooltip
+	 *  @param	int		$maxlen				Max length of visible user name
+	 *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
-        global $dolibarr_main_authentication, $dolibarr_main_demo;
-        global $menumanager;
+		global $dolibarr_main_authentication, $dolibarr_main_demo;
+		global $menumanager;
 
-        $result = '';
+		$result = '';
 
-        $label = '<u>'.$langs->trans("Page").'</u>';
-        $label .= '<br>';
-        $label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
-        $label .= '<b>'.$langs->trans('ID').':</b> '.$this->id.'<br>';
-        $label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';
-        $label .= '<b>'.$langs->trans('Language').':</b> '.$this->lang;
+		$label = '<u>'.$langs->trans("Page").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
+		$label .= '<b>'.$langs->trans('ID').':</b> '.$this->id.'<br>';
+		$label .= '<b>'.$langs->trans('Title').':</b> '.$this->title.'<br>';
+		$label .= '<b>'.$langs->trans('Language').':</b> '.$this->lang;
 
-        $url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
+		$url = DOL_URL_ROOT.'/website/index.php?websiteid='.$this->fk_website.'&pageid='.$this->id;
 
-        $linkclose = '';
-        if (empty($notooltip))
-        {
-        	if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-        	{
-        		$label = $langs->trans("ShowMyObject");
-        		$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
-        	}
-        	$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
-        	$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-        }
-        else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		$linkclose = '';
+		if (empty($notooltip))
+		{
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label = $langs->trans("ShowMyObject");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		}
+		else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 
-        $linkstart = '<a href="'.$url.'"';
-        $linkstart .= $linkclose.'>';
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
 
 		//$linkstart = $linkend = '';
@@ -772,7 +772,7 @@ class WebsitePage extends CommonObject
 		return $this->LibStatut($this->status, $mode);
 	}
 
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Renvoi le libelle d'un status donne
 	 *
@@ -782,7 +782,7 @@ class WebsitePage extends CommonObject
 	 */
 	public function LibStatut($status, $mode = 0)
 	{
-        // phpcs:enable
+		// phpcs:enable
 		global $langs;
 
 		if (empty($this->labelStatus) || empty($this->labelStatusShort))
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index fed5be51e87..9f213b3d63a 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -130,10 +130,10 @@ if ($pageid < 0) $pageid = 0;
 if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 {
 	$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), $pageref);
-    if ($res == 0)
-    {
-        $res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
-    }
+	if ($res == 0)
+	{
+		$res = $objectpage->fetch($pageid, ($object->id > 0 ? $object->id : null), null, $pageref);
+	}
 
 	// Check if pageid is inside the new website, if not we reset param pageid
 	if ($res >= 0 && $object->id > 0)
@@ -303,28 +303,28 @@ $permissiontodelete = $user->rights->website->delete;
 // Protections
 if (GETPOST('refreshsite') || GETPOST('refreshsite_x') || GETPOST('refreshsite.x') || GETPOST('refreshpage') || GETPOST('refreshpage_x') || GETPOST('refreshpage.x'))
 {
-    $action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
+	$action = 'preview'; // To avoid to make an action on another page or another site when we click on button to select another site or page.
 }
 if (GETPOST('refreshsite', 'alpha') || GETPOST('refreshsite.x', 'alpha') || GETPOST('refreshsite_x', 'alpha'))		// If we change the site, we reset the pageid and cancel addsite action.
 {
-    if ($action == 'addsite') $action = 'preview';
-    if ($action == 'updatesource') $action = 'preview';
+	if ($action == 'addsite') $action = 'preview';
+	if ($action == 'updatesource') $action = 'preview';
 
-    $pageid = $object->fk_default_home;
-    if (empty($pageid))
-    {
-    	$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
-    	if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
-    	$atleastonepage = (is_array($array) && count($array) > 0);
+	$pageid = $object->fk_default_home;
+	if (empty($pageid))
+	{
+		$array = $objectpage->fetchAll($object->id, 'ASC,ASC', 'type_container,pageurl');
+		if (!is_array($array) && $array < 0) dol_print_error('', $objectpage->error, $objectpage->errors);
+		$atleastonepage = (is_array($array) && count($array) > 0);
 
-    	$firstpageid = 0; $homepageid = 0;
-    	foreach ($array as $key => $valpage)
-    	{
-    		if (empty($firstpageid)) $firstpageid = $valpage->id;
-    		if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
-    	}
-    	$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
-    }
+		$firstpageid = 0; $homepageid = 0;
+		foreach ($array as $key => $valpage)
+		{
+			if (empty($firstpageid)) $firstpageid = $valpage->id;
+			if ($object->fk_default_home && $key == $object->fk_default_home) $homepageid = $valpage->id;
+		}
+		$pageid = ($homepageid ? $homepageid : $firstpageid); // We choose home page and if not defined yet, we take first page
+	}
 }
 if (GETPOST('refreshpage', 'alpha') && !in_array($action, array('updatecss'))) $action = 'preview';
 
@@ -529,9 +529,9 @@ if ($action == 'addsite')
 	$db->begin();
 
 	if (GETPOST('virtualhost', 'alpha') && !preg_match('/^http/', GETPOST('virtualhost', 'alpha')))
-    {
-        $error++;
-        setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+	{
+		$error++;
+		setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
 	}
 
 	if (!$error && !GETPOST('WEBSITE_REF', 'alpha'))
@@ -1278,54 +1278,54 @@ if ($action == 'updatecss')
 		{
 			$tmpvirtualhost = preg_replace('/\/$/', '', GETPOST('virtualhost', 'alpha'));
 			if ($tmpvirtualhost && !preg_match('/^http/', $tmpvirtualhost))
-    		{
-    		    $error++;
-    		    setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
-    		    $action = 'editcss';
-    		}
+			{
+				$error++;
+				setEventMessages($langs->trans('ErrorURLMustStartWithHttp', $langs->transnoentitiesnoconv("VirtualHost")), null, 'errors');
+				$action = 'editcss';
+			}
 
-    		if (!$error)
-    		{
-    			$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
-    			foreach ($arrayotherlang as $key => $val) {
-    				$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
-    			}
+			if (!$error)
+			{
+				$arrayotherlang = explode(',', GETPOST('WEBSITE_OTHERLANG', 'alphanohtml'));
+				foreach ($arrayotherlang as $key => $val) {
+					$arrayotherlang[$key] = substr(trim($val), 0, 2); // Kept short language code only
+				}
 
-    			$object->virtualhost = $tmpvirtualhost;
-    		    $object->lang = GETPOST('WEBSITE_LANG', 'aZ09');
-    		    $object->otherlang = join(',', $arrayotherlang);
-    		    $object->use_manifest = GETPOST('use_manifest', 'alpha');
+				$object->virtualhost = $tmpvirtualhost;
+				$object->lang = GETPOST('WEBSITE_LANG', 'aZ09');
+				$object->otherlang = join(',', $arrayotherlang);
+				$object->use_manifest = GETPOST('use_manifest', 'alpha');
 
-    		    $result = $object->update($user);
-        		if ($result < 0)
-        		{
-        		    $error++;
-        		    setEventMessages($object->error, $object->errors, 'errors');
-        		    $action = 'editcss';
-        		}
-    		}
+				$result = $object->update($user);
+				if ($result < 0)
+				{
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+					$action = 'editcss';
+				}
+			}
 		}
 
 		if (!$error)
 		{
-    		// Save master.inc.php file
-    		dol_syslog("Save master file ".$filemaster);
+			// Save master.inc.php file
+			dol_syslog("Save master file ".$filemaster);
 
-    		dol_mkdir($pathofwebsite);
+			dol_mkdir($pathofwebsite);
 
-    		// Now generate the master.inc.php page
-    		$result = dolSaveMasterFile($filemaster);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filemaster, null, 'errors');
-    		}
+			// Now generate the master.inc.php page
+			$result = dolSaveMasterFile($filemaster);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filemaster, null, 'errors');
+			}
 
 
-    		// Html header file
-    		$htmlheadercontent = '';
+			// Html header file
+			$htmlheadercontent = '';
 
-    		/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
+			/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
     	    $htmlheadercontent.= "<?php // BEGIN PHP\n";
     	    $htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
     	    $htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
@@ -1335,84 +1335,84 @@ if ($action == 'updatecss')
     	    // $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
     	    $htmlheadercontent.= "// END PHP ?>\n";*/
 
-    		$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
+			$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
 
-    		/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
+			/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
     	    $htmlheadercontent.= "// END PHP ?>"."\n";*/
 
-    		$htmlheadercontent = trim($htmlheadercontent)."\n";
+			$htmlheadercontent = trim($htmlheadercontent)."\n";
 
-    		$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
-    		}
+			$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+			}
 
 
-    		// Css file
-    		$csscontent = '';
+			// Css file
+			$csscontent = '';
 
-    		$csscontent .= "<?php // BEGIN PHP\n";
-    		$csscontent .= '$websitekey=basename(__DIR__);'."\n";
-    		$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-    		$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$csscontent .= "ob_start();\n";
-    		$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
-    		$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$csscontent .= "header('Content-type: text/css');\n";
-    		$csscontent .= "}\n";
-    		$csscontent .= "// END PHP ?>\n";
+			$csscontent .= "<?php // BEGIN PHP\n";
+			$csscontent .= '$websitekey=basename(__DIR__);'."\n";
+			$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+			$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$csscontent .= "ob_start();\n";
+			$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
+			$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$csscontent .= "header('Content-type: text/css');\n";
+			$csscontent .= "}\n";
+			$csscontent .= "// END PHP ?>\n";
 
-    		$csscontent .= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
+			$csscontent .= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
 
-    		$csscontent .= '<?php // BEGIN PHP'."\n";
-    		$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
-    		$csscontent .= "// END PHP ?>\n";
+			$csscontent .= '<?php // BEGIN PHP'."\n";
+			$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
+			$csscontent .= "// END PHP ?>\n";
 
-    		dol_syslog("Save css content into ".$filecss);
+			dol_syslog("Save css content into ".$filecss);
 
-    		$result = dolSaveCssFile($filecss, $csscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filecss, null, 'errors');
-    		}
+			$result = dolSaveCssFile($filecss, $csscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filecss, null, 'errors');
+			}
 
 
-    		// Js file
-    		$jscontent = '';
+			// Js file
+			$jscontent = '';
 
-    		$jscontent .= "<?php // BEGIN PHP\n";
-    		$jscontent .= '$websitekey=basename(__DIR__);'."\n";
-    		$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-    		$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-    		$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-    		$jscontent .= "ob_start();\n";
-    		$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-    		$jscontent .= "header('Content-type: application/javascript');\n";
-    		$jscontent .= "// END PHP ?>\n";
+			$jscontent .= "<?php // BEGIN PHP\n";
+			$jscontent .= '$websitekey=basename(__DIR__);'."\n";
+			$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+			$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+			$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+			$jscontent .= "ob_start();\n";
+			$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+			$jscontent .= "header('Content-type: application/javascript');\n";
+			$jscontent .= "// END PHP ?>\n";
 
-    		$jscontent .= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
+			$jscontent .= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
 
-    		$jscontent .= '<?php // BEGIN PHP'."\n";
-    		$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
-    		$jscontent .= "// END PHP ?>\n";
+			$jscontent .= '<?php // BEGIN PHP'."\n";
+			$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
+			$jscontent .= "// END PHP ?>\n";
 
-    		$result = dolSaveJsFile($filejs, $jscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filejs, null, 'errors');
-    		}
+			$result = dolSaveJsFile($filejs, $jscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filejs, null, 'errors');
+			}
 
 
-    		// Robot file
-    		$robotcontent = '';
+			// Robot file
+			$robotcontent = '';
 
-    		/*$robotcontent.= "<?php // BEGIN PHP\n";
+			/*$robotcontent.= "<?php // BEGIN PHP\n";
     	    $robotcontent.= '$websitekey=basename(__DIR__);'."\n";
     	    $robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
     	    $robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
@@ -1422,63 +1422,63 @@ if ($action == 'updatecss')
     	    $robotcontent.= "header('Content-type: text/css');\n";
     	    $robotcontent.= "// END PHP ?>\n";*/
 
-    		$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'))."\n";
+			$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'))."\n";
 
-    		/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
+			/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
     	    $robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
     	    $robotcontent.= "// END PHP ?>"."\n";*/
 
-    		$result = dolSaveRobotFile($filerobot, $robotcontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filerobot, null, 'errors');
-    		}
+			$result = dolSaveRobotFile($filerobot, $robotcontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filerobot, null, 'errors');
+			}
 
 
-    		// Htaccess file
-    		$htaccesscontent = '';
-    		$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'))."\n";
+			// Htaccess file
+			$htaccesscontent = '';
+			$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'))."\n";
 
-    		$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
-    		if (!$result)
-    		{
-    			$error++;
-    			setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
-    		}
+			$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
+			if (!$result)
+			{
+				$error++;
+				setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+			}
 
 
-       		// manifest.json file
-       		$manifestjsoncontent = '';
+	   		// manifest.json file
+	   		$manifestjsoncontent = '';
 
-       		$manifestjsoncontent .= "<?php // BEGIN PHP\n";
-       		$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
-       		$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-       		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-       		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-       		$manifestjsoncontent .= "ob_start();\n";
-       		$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-       		$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
-       		$manifestjsoncontent .= "// END PHP ?>\n";
+	   		$manifestjsoncontent .= "<?php // BEGIN PHP\n";
+	   		$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
+	   		$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+	   		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+	   		$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+	   		$manifestjsoncontent .= "ob_start();\n";
+	   		$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+	   		$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
+	   		$manifestjsoncontent .= "// END PHP ?>\n";
 
-       		$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
+	   		$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
 
-       		$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
-       		$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-       		$manifestjsoncontent .= "// END PHP ?>\n";
+	   		$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
+	   		$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+	   		$manifestjsoncontent .= "// END PHP ?>\n";
 
-       		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
-       		if (!$result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
-       		}
+	   		$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+	   		if (!$result)
+	   		{
+	   			$error++;
+	   			setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+	   		}
 
 
-       		// README.md file
-       		$readmecontent = '';
+	   		// README.md file
+	   		$readmecontent = '';
 
-       		/*$readmecontent.= "<?php // BEGIN PHP\n";
+	   		/*$readmecontent.= "<?php // BEGIN PHP\n";
        		$readmecontent.= '$websitekey=basename(__DIR__);'."\n";
        		$readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
        		$readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
@@ -1488,42 +1488,42 @@ if ($action == 'updatecss')
        		$readmecontent.= "header('Content-type: application/manifest+json');\n";
        		$readmecontent.= "// END PHP ?>\n";*/
 
-       		$readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
+	   		$readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
 
-       		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
+	   		/*$readmecontent.= '<?php // BEGIN PHP'."\n";
        		$readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
        		$readmecontent.= "// END PHP ?>"."\n";*/
 
-       		$result = dolSaveReadme($filereadme, $readmecontent);
-       		if (!$result)
-       		{
-       			$error++;
-       			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
-       		}
+	   		$result = dolSaveReadme($filereadme, $readmecontent);
+	   		if (!$result)
+	   		{
+	   			$error++;
+	   			setEventMessages('Failed to write file '.$filereadme, null, 'errors');
+	   		}
 
 
-       		// Save wrapper.php
+	   		// Save wrapper.php
 			$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
 
 
-    		// Message if no error
-    		if (!$error)
-    		{
-    			setEventMessages($langs->trans("Saved"), null, 'mesgs');
-    		}
+			// Message if no error
+			if (!$error)
+			{
+				setEventMessages($langs->trans("Saved"), null, 'mesgs');
+			}
 
-    		if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
-    		{
-    			$action = 'preview';
-    			if ($backtopage)
-	    		{
-	    			header("Location: ".$backtopage);
-	    			exit;
-	    		}
-    		}
-    		else {
-    			$action = 'editcss';
-    		}
+			if (!GETPOSTISSET('updateandstay'))	// If we click on "Save And Stay", we don not make the redirect
+			{
+				$action = 'preview';
+				if ($backtopage)
+				{
+					header("Location: ".$backtopage);
+					exit;
+				}
+			}
+			else {
+				$action = 'editcss';
+			}
 		}
 	}
 }
@@ -1660,7 +1660,7 @@ if ($action == 'updatemeta')
 		$objectpage->fk_page = (GETPOST('pageidfortranslation', 'int') > 0 ? GETPOST('pageidfortranslation', 'int') : 0);
 		$objectpage->author_alias = trim(GETPOST('WEBSITE_AUTHORALIAS', 'alphanohtml'));
 		$objectpage->object_type = GETPOST('WEBSITE_OBJECTCLASS', 'alpha');
-        $objectpage->fk_object = GETPOST('WEBSITE_OBJECTID', 'aZ09');
+		$objectpage->fk_object = GETPOST('WEBSITE_OBJECTID', 'aZ09');
 
 		$newdatecreation = dol_mktime(GETPOST('datecreationhour', 'int'), GETPOST('datecreationmin', 'int'), GETPOST('datecreationsec', 'int'), GETPOST('datecreationmonth', 'int'), GETPOST('datecreationday', 'int'), GETPOST('datecreationyear', 'int'));
 		if ($newdatecreation) $objectpage->date_creation = $newdatecreation;
@@ -1932,35 +1932,35 @@ if (($action == 'updatesource' || $action == 'updatecontent' || $action == 'conf
 
 			$objectpage->content = GETPOST('PAGE_CONTENT', 'none');
 
-            // Security analysis
+			// Security analysis
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 			//print dol_escape_htmltag($phpfullcodestring);exit;
-            $forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
-            if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
-            {
-                $forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
-            }
-            foreach ($forbiddenphpcommands as $forbiddenphpcommand)
-            {
-                if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
-                {
-                    $error++;
-                    setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
-                }
-            }
+			$forbiddenphpcommands = array("exec", "passthru", "system", "shell_exec", "proc_open");
+			if (empty($conf->global->WEBSITE_PHP_ALLOW_WRITE))    // If option is not on, we disallow functions to write files
+			{
+				$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
+			}
+			foreach ($forbiddenphpcommands as $forbiddenphpcommand)
+			{
+				if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring))
+				{
+					$error++;
+					setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
+					if ($action == 'updatesource') $action = 'editsource';
+					if ($action == 'updatecontent') $action = 'editcontent';
+				}
+			}
 
-            if (empty($user->rights->website->writephp))
-            {
-                if ($phpfullcodestringold != $phpfullcodestring)
-                {
-                    $error++;
-                    setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
-                    if ($action == 'updatesource') $action = 'editsource';
-                    if ($action == 'updatecontent') $action = 'editcontent';
-                }
-            }
+			if (empty($user->rights->website->writephp))
+			{
+				if ($phpfullcodestringold != $phpfullcodestring)
+				{
+					$error++;
+					setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
+					if ($action == 'updatesource') $action = 'editsource';
+					if ($action == 'updatecontent') $action = 'editcontent';
+				}
+			}
 
 			// Clean data. We remove all the head section.
 			$objectpage->content = preg_replace('/<head>.*<\/head>/ims', '', $objectpage->content);
@@ -2410,24 +2410,7 @@ if (!GETPOST('hide_websitemenu'))
 
 			if (! empty($conf->categorie->enabled)) {
 				//print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&dol_hide_leftmenu=1&nosearch=1&type=website_page&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
-
-				//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
-				print '<a class="button bordertransp button_categories"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("Categories")).'"><span class="fa fa-tags"><span></a>';
-				print '<script language="javascript">
-				 jQuery(document).ready(function () {
-					 jQuery(".button_categories").click(function () {
-						 var $dialog = $(\'<div></div>\').html(\'<iframe class="iframedialog" style="border: 0px;" src="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.$website->ref.'" width="100%" height="98%"></iframe>\')
-						 .dialog({
-						 	autoOpen: false,
-						 	modal: true,
-						 	height: (window.innerHeight - 150),
-						 	width: \'80%\',
-						 	title: "'.dol_escape_js($langs->transnoentitiesnoconv("Categories")).'"
-						 });
-						 $dialog.dialog(\'open\');
-					 });
-				 });
-				 </script>';
+				print dolButtonToOpenUrlInDialogPopup('categories', $langs->transnoentitiesnoconv("Categories"), '<span class="fa fa-tags"><span>', '/categories/index.php?leftmenu=website&nosearch=1&type=website_page&website='.$website->ref, $disabled);
 			}
 
 			print '</span>';
@@ -2451,28 +2434,28 @@ if (!GETPOST('hide_websitemenu'))
 		$htmltext = '';
 		if (empty($object->fk_default_home))
 		{
-		    $htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
+			$htmltext .= '<br><span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br><br>';
 		}
 		elseif (empty($virtualurl))
 		{
-		    //$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
+			//$htmltext .= '<br><span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span><br><br>';
 		}
 		else {
-		    $htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
+			$htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
 		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER))
 		{
-		    $htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
+			$htmltext .= '<br>'.$langs->trans($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER);
 		}
 		else {
-    		$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
-    		$htmltext .= '<br>';
-    		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-    		$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
+			$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
+			$htmltext .= '<br>';
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
+			$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias');
 
-    		$examplewithapache = '#php_admin_value open_basedir /tmp/:'.DOL_DOCUMENT_ROOT.':'.DOL_DATA_ROOT.':/dev/urandom'."\n";
-    		$examplewithapache .= '<Directory "'.DOL_DOCUMENT_ROOT.'">'."\n";
-    		$examplewithapache .= 'AllowOverride FileInfo Options
+			$examplewithapache = '#php_admin_value open_basedir /tmp/:'.DOL_DOCUMENT_ROOT.':'.DOL_DATA_ROOT.':/dev/urandom'."\n";
+			$examplewithapache .= '<Directory "'.DOL_DOCUMENT_ROOT.'">'."\n";
+			$examplewithapache .= 'AllowOverride FileInfo Options
     		Options       -Indexes -MultiViews -FollowSymLinks -ExecCGI
     		Require all granted
     		</Directory>
@@ -2487,14 +2470,14 @@ if (!GETPOST('hide_websitemenu'))
     		Require all granted
     		</Directory>';
 
-    		$htmltext .= '<br>'.$langs->trans("ExampleToUseInApacheVirtualHostConfig").':<br>';
-    		$htmltext .= '<div class="centpercent exampleapachesetup">'.dol_nl2br(dol_escape_htmltag($examplewithapache, 1, 1)).'</div>';
+			$htmltext .= '<br>'.$langs->trans("ExampleToUseInApacheVirtualHostConfig").':<br>';
+			$htmltext .= '<div class="centpercent exampleapachesetup">'.dol_nl2br(dol_escape_htmltag($examplewithapache, 1, 1)).'</div>';
 
-    		$htmltext .= '<br>';
-    		$htmltext .= $langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
-    		$htmltext .= '<br>';
-    		$htmltext .= '<br>';
-    		$htmltext .= $langs->trans("YouCanAlsoDeployToAnotherWHP");
+			$htmltext .= '<br>';
+			$htmltext .= $langs->trans("YouCanAlsoTestWithPHPS", $dataroot);
+			$htmltext .= '<br>';
+			$htmltext .= '<br>';
+			$htmltext .= $langs->trans("YouCanAlsoDeployToAnotherWHP");
 		}
 		print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 3, 'helpvirtualhost');
 		print '</span>';
@@ -2835,14 +2818,14 @@ if (!GETPOST('hide_websitemenu'))
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSource2", $url);
 			$htmltext .= $langs->transnoentitiesnoconv("YouCanEditHtmlSourceMore", $url);
 			$htmltext .= '<br>';
-            if ($conf->browser->layout == 'phone')
-            {
-                print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
-            else {
-            	//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
-            	print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
-            }
+			if ($conf->browser->layout == 'phone')
+			{
+				print $form->textwithpicto('', $htmltext, 1, 'help', 'inline-block', 1, 2, 'tooltipsubstitution');
+			}
+			else {
+				//img_help(($tooltiptrigger != '' ? 2 : 1), $alt)
+				print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
+			}
 		}
 		print '</span>'; // end websitehelp
 
@@ -3583,16 +3566,16 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	}
 
 	print '<tr><td class="titlefieldcreate">';
-    print 'ObjectClass';
-    print '</td><td>';
-    print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTCLASS" placeholder="ClassName::/path/class/ObjectClass.class.php" >';
-    print '</td></tr>';
+	print 'ObjectClass';
+	print '</td><td>';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTCLASS" placeholder="ClassName::/path/class/ObjectClass.class.php" >';
+	print '</td></tr>';
 
-    print '<tr><td class="titlefieldcreate">';
-    print 'ObjectID';
-    print '</td><td>';
-    print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTID" >';
-    print '</td></tr>';
+	print '<tr><td class="titlefieldcreate">';
+	print 'ObjectID';
+	print '</td><td>';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_OBJECTID" >';
+	print '</td></tr>';
 
 
 	$fuser = new User($db);
@@ -3602,8 +3585,8 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 	print '</td><td>';
 	if ($pageauthorid > 0)
 	{
-	    $fuser->fetch($pageauthorid);
-	    print $fuser->getNomUrl(1);
+		$fuser->fetch($pageauthorid);
+		print $fuser->getNomUrl(1);
 	} else {
 		print '<span class="opacitymedium">'.$langs->trans("Unknown").'</span>';
 	}
@@ -3624,17 +3607,17 @@ if ($action == 'editmeta' || $action == 'createcontainer')
 
 	if ($action != 'createcontainer')
 	{
-	    print '<tr><td>';
-	    print $langs->trans('UserModif');
-	    print '</td><td>';
-	    if ($pageusermodifid > 0)
-	    {
-	        $fuser->fetch($pageusermodifid);
-	        print $fuser->getNomUrl(1);
-	    }
-	    print '</td></tr>';
+		print '<tr><td>';
+		print $langs->trans('UserModif');
+		print '</td><td>';
+		if ($pageusermodifid > 0)
+		{
+			$fuser->fetch($pageusermodifid);
+			print $fuser->getNomUrl(1);
+		}
+		print '</td></tr>';
 
-	    print '<tr><td>';
+		print '<tr><td>';
 		print $langs->trans('DateModification');
 		print '</td><td>';
 		print dol_print_date($pagedatemodification, 'dayhour', 'tzuser');
@@ -4249,7 +4232,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 		// Change the contenteditable to "true" or "false" when mode Edit Inline is on or off
 		if (empty($conf->global->WEBSITE_EDITINLINE))
 		{
-		    // Remove the contenteditable="true"
+			// Remove the contenteditable="true"
 			$newcontent = preg_replace('/(div|section)(\s[^\>]*)contenteditable="true"/', '\1\2', $newcontent);
 		}
 		else {
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 403128a0f8b..1c976ecc74b 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -55,7 +55,7 @@ $search_all = GETPOST("search_all", 'alpha');
 $search = array();
 foreach ($object->fields as $key => $val)
 {
-    if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
+	if (GETPOST('search_'.$key, 'alpha')) $search[$key] = GETPOST('search_'.$key, 'alpha');
 }
 
 if (empty($action) && empty($id) && empty($ref)) $action = 'view';
@@ -198,7 +198,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 {
 	if ($object->fk_soc > 0 && empty($socid)) $socid = $object->fk_soc;
 
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
 	$head = websiteaccountPrepareHead($object);
 	dol_fiche_head($head, 'card', $langs->trans("WebsiteAccount"), -1, 'websiteaccount@website');
@@ -207,7 +207,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsiteAccount'), $langs->trans('ConfirmDeleteWebsiteAccount'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsiteAccount'), $langs->trans('ConfirmDeleteWebsiteAccount'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Call Hook formConfirm
@@ -298,24 +298,24 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook))
-    	{
-    	    // Send
-    		if (empty($user->socid)) {
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
-    		}
+		if (empty($reshook))
+		{
+			// Send
+			if (empty($user->socid)) {
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>'."\n";
+			}
 
-    		if ($user->rights->website->write)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
-    		}
+			if ($user->rights->website->write)
+			{
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+			}
 
-    		/*
+			/*
     		if ($user->rights->sellyoursaas->create)
     		{
     			if ($object->status == 1)
@@ -329,28 +329,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->website->delete)
-    		{
-    			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			if ($user->rights->website->delete)
+			{
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a></div>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
 	// Select mail models is same action as presend
 	if (GETPOST('modelselected')) {
-	    $action = 'presend';
+		$action = 'presend';
 	}
 
 	if ($action != 'presend')
 	{
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    /*
+		/*
 	    $MAXEVENT = 10;
 
 	    // List of actions on element
@@ -359,7 +359,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    $somethingshown = $formactions->showactions($object, 'websiteaccount', $socid, 1, '', $MAXEVENT);
 	    */
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	// Presend form
diff --git a/htdocs/zapier/hook_card.php b/htdocs/zapier/hook_card.php
index 721b40ebfd9..b0441c34f06 100644
--- a/htdocs/zapier/hook_card.php
+++ b/htdocs/zapier/hook_card.php
@@ -82,31 +82,31 @@ $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action
 if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
 if (empty($reshook)) {
-    $error = 0;
+	$error = 0;
 
-    $permissiontoadd = $user->rights->mymodule->write;
-    $permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0);
-    $backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
-    if (empty($backtopage)) {
-        if (empty($id)) $backtopage = $backurlforlist;
-        else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
-    }
-    $triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
+	$permissiontoadd = $user->rights->mymodule->write;
+	$permissiontodelete = $user->rights->mymodule->delete || ($permissiontoadd && $object->status == 0);
+	$backurlforlist = dol_buildpath('/mymodule/myobject_list.php', 1);
+	if (empty($backtopage)) {
+		if (empty($id)) $backtopage = $backurlforlist;
+		else $backtopage = dol_buildpath('/mymodule/myobject_card.php', 1).($id > 0 ? $id : '__ID__');
+	}
+	$triggermodname = 'MYMODULE_MYOBJECT_MODIFY'; // Name of trigger action code to execute when we modify record
 
-    // Actions cancel, add, update, delete or clone
-    include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	// Actions cancel, add, update, delete or clone
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
-    // Actions when linking object each other
-    include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
 
-    // Actions when printing a doc from card
-    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
-    // Actions to send emails
-    $triggersendname = 'MYOBJECT_SENTBYMAIL';
-    $autocopy = 'MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
-    $trackid = 'myobject'.$object->id;
-    include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+	// Actions to send emails
+	$triggersendname = 'MYOBJECT_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_MYOBJECT_TO';
+	$trackid = 'myobject'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
 
@@ -176,7 +176,7 @@ if (($id || $ref) && $action == 'edit') {
 	print load_fiche_titre($langs->trans("MyObject"));
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
@@ -204,7 +204,7 @@ if (($id || $ref) && $action == 'edit') {
 
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
-    $res = $object->fetch_optionals();
+	$res = $object->fetch_optionals();
 
 	$head = myobjectPrepareHead($object);
 	dol_fiche_head($head, 'card', $langs->trans("MyObject"), -1, 'myobject@mymodule');
@@ -213,7 +213,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteMyObject'), $langs->trans('ConfirmDeleteMyObject'), 'confirm_delete', '', 0, 1);
 	}
 
 	// Clone confirmation
@@ -226,7 +226,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Confirmation of action xxxx
 	if ($action == 'xxx') {
 		$formquestion = array();
-	    /*
+		/*
 		$forcecombo=0;
 		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
 	    $formquestion = array(
@@ -236,7 +236,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	        // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
         );
 	    */
-	    $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
 	}
 
 	// Call Hook formConfirm
@@ -320,25 +320,25 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	// Buttons for actions
 	if ($action != 'presend' && $action != 'editline') {
-    	print '<div class="tabsAction">'."\n";
-    	$parameters = array();
-    	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-    	if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
-    	if (empty($reshook)) {
-            // Modify
-    		if ($user->rights->mymodule->write) {
-    			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
-    		} else {
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
-    		}
+		if (empty($reshook)) {
+			// Modify
+			if ($user->rights->mymodule->write) {
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=edit">'.$langs->trans("Modify").'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
+			}
 
-    		// Clone
-    		if ($user->rights->mymodule->write) {
-    			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
-    		}
+			// Clone
+			if ($user->rights->mymodule->write) {
+				print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a></div>';
+			}
 
-    		/*
+			/*
     		if ($user->rights->mymodule->write)
     		{
     			if ($object->status == 1)
@@ -352,13 +352,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     		}
     		*/
 
-    		if ($user->rights->mymodule->delete) {
-    			print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-    		} else {
-    			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
-    		}
-    	}
-    	print '</div>'."\n";
+			if ($user->rights->mymodule->delete) {
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete&amp;token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+			} else {
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			}
+		}
+		print '</div>'."\n";
 	}
 
 
@@ -368,28 +368,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 
 	if ($action != 'presend') {
-	    print '<div class="fichecenter"><div class="fichehalfleft">';
-	    print '<a name="builddoc"></a>'; // ancre
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
 
-	    // Show links to link elements
-	    $linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
-	    $somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('myobject'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-	    print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
 
-	    $MAXEVENT = 10;
+		$MAXEVENT = 10;
 
-	    $morehtmlright = '<a href="'.dol_buildpath('/mymodule/myobject_info.php', 1).'?id='.$object->id.'">';
-	    $morehtmlright .= $langs->trans("SeeAll");
-	    $morehtmlright .= '</a>';
+		$morehtmlright = '<a href="'.dol_buildpath('/mymodule/myobject_info.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
 
-	    // List of actions on element
-	    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
-	    $formactions = new FormActions($db);
-	    $somethingshown = $formactions->showactions($object, 'myobject', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'myobject', $socid, 1, '', $MAXEVENT, '', $morehtmlright);
 
-	    print '</div></div></div>';
+		print '</div></div></div>';
 	}
 
 	//Select mail models is same action as presend
diff --git a/nightwatch.conf.js b/nightwatch.conf.js
new file mode 100644
index 00000000000..e72febea918
--- /dev/null
+++ b/nightwatch.conf.js
@@ -0,0 +1,27 @@
+const admin_username = process.env.ADMIN_USERNAME || 'admin';
+const admin_password = process.env.ADMIN_PASSWORD || 'password';
+const launch_url = process.env.LAUNCH_URL || 'http://localhost/dolibarr/htdocs/';
+module.exports = {
+	page_objects_path : './test/acceptance/pageObjects/', // jshint ignore:line
+	src_folders : ['test'],
+
+	test_settings : {
+		default : {
+			selenium_host : '127.0.0.1',
+			launchUrl : launch_url,
+			globals : {
+				backend_url : launch_url,
+				adminUsername : admin_username,
+				adminPassword : admin_password
+			},
+			desiredCapabilities : {
+				browserName : 'chrome',
+				javascriptEnabled : true,
+				chromeOptions : {
+					args : ['disable-gpu', 'window-size=1280,1024'],
+					w3c : false
+				}
+			}
+		}
+	}
+};
diff --git a/package.json b/package.json
new file mode 100644
index 00000000000..01d3a4300ee
--- /dev/null
+++ b/package.json
@@ -0,0 +1,14 @@
+{
+  "devDependencies": {
+    "cucumber": "^6.0.5",
+    "nightwatch": "^1.4.3",
+    "nightwatch-api": "^3.0.1"
+  },
+  "scripts": {
+    "test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/setup.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"
+  },
+  "dependencies": {
+    "cucumber-pretty": "^6.0.0",
+    "node-fetch": "^2.6.1"
+  }
+}
diff --git a/test/acceptance/README.md b/test/acceptance/README.md
new file mode 100644
index 00000000000..ada096c0b69
--- /dev/null
+++ b/test/acceptance/README.md
@@ -0,0 +1,78 @@
+# Run End-to-End Tests
+
+### Run Selenium
+
+Selenium has been used for automating the browser.
+
+[Download](https://www.selenium.dev/downloads/) the `latest stable version` of the `Selenium standalone server JAR file`.
+
+Also [download](https://chromedriver.chromium.org/downloads) the `latest stable version` of `Chrome Driver`.
+
+Once you have downloaded Chrome Driver, you need to unzip it by running the following command:
+
+  `unzip chromedriver_linux64.zip`
+    
+Once you have unzipped it, you need to move the *chromedriver* file (shared library) and place it inside the same folder where you have placed the Selenium standalone server file.
+
+Now we can run selenium by two ways:
+
+* Start selenium server with a command which usually looks like:
+
+   `java -jar selenium-server-standalone-<selenium version>.jar -port 4444`
+
+
+* Run selenium in docker with
+
+   `docker run -d -p 4444:4444 -p 5900:5900 -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+   
+   or `docker run -d --network="host" -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+
+   or `docker run -d --network host -v /dev/shm:/dev/shm selenium/standalone-chrome-debug`
+
+### Run the acceptance tests 
+
+* Install *yarn*. For example on Ubuntu:
+
+   ```
+   apt install yarnpkg
+   ```
+
+* Install *nodejs* libraries. For example on Ubuntu:
+
+   ```
+   apt install npm
+   npm install cucumber
+   npm install nightwatch-api
+   npm install nightwatch
+   npm update
+   ```
+
+* In *nightwatch.conf.js* file inside the root directory of the project and inside the configuration file following environment variable has been specified. We can change the default values according to our local configuration.
+
+   ```
+    const admin_username = process.env.ADMIN_USERNAME || 'admin';
+
+    const admin_password = process.env.ADMIN_PASSWORD || 'password';
+
+    const launch_url = process.env.LAUNCH_URL || 'http://localhost/dolibarr/htdocs/';
+   ```
+
+* You can run a test using following commands
+
+  `LAUNCH_URL='<launch_url>'; ADMIN_USERNAME='<admin_username>'; ADMIN_PASSWORD='<admin_password>';`
+  
+  `yarn run test:e2e test/acceptance/features/<feature_file>`
+   
+  For example: `yarn run test:e2e test/acceptance/features/WebUI/addUsers.feature`
+ 
+  Note: The script to run all the acceptance tests is specified in `scripts` object of `package.json` file inside the project's root directory as :
+ 
+  `"test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"`
+     
+  After you run the above command you can see the test running. For that : 
+  
+* open `Remmina` (Remmina is a Remote Desktop Client and comes installed with Ubuntu)
+  
+* choose `VNC` and enter `localhost` on the address bar
+  
+* enter `secret` as the password
diff --git a/test/acceptance/features/Api/apiAddUsers.feature b/test/acceptance/features/Api/apiAddUsers.feature
new file mode 100644
index 00000000000..32d94a7b3cf
--- /dev/null
+++ b/test/acceptance/features/Api/apiAddUsers.feature
@@ -0,0 +1,67 @@
+Feature: Add user
+  As an admin
+  I want to add users
+  So that the authorized access is possible
+
+  Scenario: Admin adds user without permission
+    Given the user with login "harrypotter@gmail.com" does not exist
+    When the admin creates user with following details using API
+      | last name | Potter                |
+      | login     | harrypotter@gmail.com |
+      | password  | password              |
+    Then the response status code should be "200"
+    And user with login "harrypotter@gmail.com" should exist
+
+  Scenario: Admin creates already existing user
+    Given the admin has created the following users
+      | login | last name | password |
+      | Harry | Potter    | hello123 |
+    When the admin creates user with following details using API
+      | last name | Potter   |
+      | login     | Harry    |
+      | password  | hello123 |
+    Then the response status code should be "500"
+    And the response message should be "ErrorLoginAlreadyExists"
+
+  Scenario Outline: Admin adds user with incomplete essential credentials
+    Given the user with login "Harry" does not exist
+    When the admin creates user with following details using API
+      | last name | <last name> |
+      | login     | Harry       |
+      | password  | <password>  |
+    Then the response status code should be "200"
+    And user with login "Harry" should exist
+    Examples:
+      | last name | password |
+      |           |          |
+      | Manson    |          |
+      |           | 123      |
+
+  Scenario Outline: Admin adds user without login
+    Given the user with login "harrypotter@gmail.com" does not exist
+    When the admin creates user with following details using API
+      | last name | <last name> |
+      | login     |             |
+      | password  | <password>  |
+    Then the response status code should be "500"
+    And the response message should be "Field 'Login' is required"
+    Examples:
+      | last name | password |
+      | Potter    | Hello123 |
+      | Potter    |          |
+      |           | hello123 |
+
+  Scenario Outline: Admin adds user with last name as special characters
+    Given the user with login "<login>" does not exist
+    When the admin creates user with following details using API
+      | last name | <last name> |
+      | login     | <login>     |
+      | password  | password    |
+    Then the response status code should be "200"
+    And user with login "<login>" should exist
+    Examples:
+      | last name                  | login                  |
+      | swi@                       | s$5^2       |
+      | g!!@%ui                    | नेपाली                 |
+      | swikriti@h                 | सिमप्ले $%#?&@name.txt |
+      | !@#$%^&*()-_+              | España§àôœ€            |
\ No newline at end of file
diff --git a/test/acceptance/features/WebUI/addUsers.feature b/test/acceptance/features/WebUI/addUsers.feature
new file mode 100644
index 00000000000..918bff771c2
--- /dev/null
+++ b/test/acceptance/features/WebUI/addUsers.feature
@@ -0,0 +1,86 @@
+Feature: Add user
+  As an admin
+  I want to add users
+  So that the authorized access is possible
+
+  Background:
+    Given the administrator has logged in using the webUI
+    And the administrator has browsed to the new users page
+
+  Scenario: Admin adds user without permission
+    When the admin creates user with following details
+      | last name | Potter                |
+      | login     | harrypotter@gmail.com |
+      | password  | password              |
+    Then new user "Potter" should be created
+    And message "This user has no permissions defined" should be displayed in the webUI
+
+  Scenario Outline: Admin adds user with permission
+    When the admin creates user with following details
+      | last name     | Potter                |
+      | login         | harrypotter@gmail.com |
+      | password      | password              |
+      | administrator | <administrator>       |
+      | gender        | <gender>              |
+    Then message "This user has no permissions defined" <shouldOrShouldNot> be displayed in the webUI
+    And new user "Potter" should be created
+    Examples:
+      | administrator | gender | shouldOrShouldNot |
+      | No            |        | should            |
+      | No            | Man    | should            |
+      | No            | Woman  | should            |
+      | Yes           |        | should not        |
+      | Yes           | Man    | should not        |
+      | Yes           | Woman  | should not        |
+
+  Scenario Outline: Admin adds user with last name as special characters
+    When the admin creates user with following details
+      | last name | <last name> |
+      | login     | harry       |
+      | password  | password    |
+    Then message "This user has no permissions defined" should be displayed in the webUI
+    And new user "<last name>" should be created
+    Examples:
+      | last name                  |
+      | swi@                       |
+      | g!!@%ui                    |
+      | swikriti@h                 |
+      | !@#$%^&*()-_+=[]{}:;,.<>?~ |
+      | $w!kr!t!                   |
+      | España§àôœ€                |
+      | नेपाली                     |
+      | सिमप्ले $%#?&@name.txt     |
+
+  Scenario Outline: Admin adds user with incomplete essential credentials
+    When the admin creates user with following details
+      | last name | <last name> |
+      | login     | <login>     |
+      | password  | <password>  |
+    Then message "<message>" should be displayed in the webUI
+    And new user "<last name>" should not be created
+    Examples:
+      | last name | login          | password | message                                     |
+      |           |                |          | Name is not defined.\nLogin is not defined. |
+      | Joseph    |                |          | Login is not defined.                       |
+      |           | john@gmail.com |          | Name is not defined.                        |
+      | Joseph    |                | hihi     | Login is not defined.                       |
+
+  Scenario: Admin adds user with incomplete essential credentials
+    When the admin creates user with following details
+      | last name | Doe  |
+      | login     | John |
+      | password  |      |
+    Then message "This user has no permissions defined" should be displayed in the webUI
+    And new user "Doe" should be created
+
+  Scenario: Admin tries to add user with pre-existing login credential
+    Given a user has been created with following details
+      | login | last name | password |
+      | Tyler | Joseph    | pass1234 |
+    And the administrator has browsed to the new users page
+    When the admin creates user with following details
+      | last name | Dun      |
+      | login     | Tyler    |
+      | password  | pass1234 |
+    Then message "Login already exists." should be displayed in the webUI
+    And new user "Dun" should not be created
diff --git a/test/acceptance/features/WebUI/listUsers.feature b/test/acceptance/features/WebUI/listUsers.feature
new file mode 100644
index 00000000000..e9c0443cdd4
--- /dev/null
+++ b/test/acceptance/features/WebUI/listUsers.feature
@@ -0,0 +1,29 @@
+Feature: list users
+  As an admin user
+  I want to view the list of users
+  So that I can manage users
+
+  Background:
+    Given the administrator has logged in using the webUI
+
+  Scenario: Admin user should be able to see list of created users when no new users are created
+    When the administrator browses to the list of users page using the webUI
+    Then following users should be displayed in the users list
+      | login    | last name  |
+      | dolibarr | SuperAdmin |
+    And the number of created users should be 1
+
+  Scenario: Admin user should be able to see number of created users
+    Given the admin has created the following users
+      | login    | last name | password |
+      | Harry    | Potter    | hello123 |
+      | Hermoine | Granger   | hello123 |
+      | Ron      | Weasley   | hello123 |
+    When the administrator browses to the list of users page using the webUI
+    Then following users should be displayed in the users list
+      | login    | last name  |
+      | dolibarr | SuperAdmin |
+      | Harry    | Potter     |
+      | Hermoine | Granger    |
+      | Ron      | Weasley    |
+    And the number of created users should be 4
diff --git a/test/acceptance/features/WebUI/login.feature b/test/acceptance/features/WebUI/login.feature
new file mode 100644
index 00000000000..fd7058812cf
--- /dev/null
+++ b/test/acceptance/features/WebUI/login.feature
@@ -0,0 +1,27 @@
+Feature: user login
+  As a user/admin
+  I want to login to my account
+  So that I can have access to my functionality
+
+  Background:
+    Given the user has browsed to the login page
+
+  Scenario: Admin user should be able to login successfully
+    When user logs in with username "dolibarr" and password "password"
+    Then the user should be directed to the homepage
+
+  Scenario: Admin user with empty credentials should not be able to login
+    When user logs in with username "" and password ""
+    Then the user should not be able to login
+
+  Scenario Outline: user logs in with invalid credentials
+    When user logs in with username "<username>" and password "<password>"
+    Then the user should not be able to login
+    And error message "Bad value for login or password" should be displayed in the webUI
+    Examples:
+      | username | password |
+      | dolibar  | pass     |
+      | dolibarr | passw    |
+      | dolibar  |          |
+      | dolibarr |          |
+      | dolibar  | password |
diff --git a/test/acceptance/features/WebUI/logout.feature b/test/acceptance/features/WebUI/logout.feature
new file mode 100644
index 00000000000..137c5260008
--- /dev/null
+++ b/test/acceptance/features/WebUI/logout.feature
@@ -0,0 +1,10 @@
+Feature: user logs out
+  As a user
+  I want to log out of my account
+  So that I can protect my work, identity and be assured of my privacy
+
+  Scenario: User can logout
+    Given the administrator has logged in using the webUI
+    When the user opens the user profile using the webUI
+    And the user logs out using the webUI
+    Then the user should be logged out successfully
diff --git a/test/acceptance/index.js b/test/acceptance/index.js
new file mode 100644
index 00000000000..a9fcda8105a
--- /dev/null
+++ b/test/acceptance/index.js
@@ -0,0 +1,14 @@
+const { setDefaultTimeout, After, Before } = require('cucumber')
+const { createSession, closeSession, startWebDriver, stopWebDriver } = require('nightwatch-api')
+
+setDefaultTimeout(60000)
+
+Before(async () => {
+	await startWebDriver();
+	await createSession();
+})
+
+After(async () => {
+	await closeSession();
+	await stopWebDriver();
+})
diff --git a/test/acceptance/pageObjects/addUsersPage.js b/test/acceptance/pageObjects/addUsersPage.js
new file mode 100644
index 00000000000..7f31523b842
--- /dev/null
+++ b/test/acceptance/pageObjects/addUsersPage.js
@@ -0,0 +1,128 @@
+const util = require('util');
+module.exports = {
+	url: function () {
+		return this.api.launchUrl + 'user/card.php?leftmenu=users&action=create';
+	},
+
+	commands: [
+		{
+			adminCreatesUser: async function (dataTable) {
+				const userDetails = dataTable.rowsHash();
+				let administrator = userDetails['administrator'];
+				let gender = userDetails['gender'];
+				await this.waitForElementVisible('@newUserAddOption')
+					.useXpath()
+					.waitForElementVisible('@lastnameField')
+					.clearValue('@lastnameField')
+					.setValue('@lastnameField', userDetails['last name'])
+					.waitForElementVisible('@loginField')
+					.clearValue('@loginField')
+					.setValue('@loginField', userDetails['login'])
+					.waitForElementVisible('@newUserPasswordField')
+					.clearValue('@newUserPasswordField')
+					.setValue('@newUserPasswordField', userDetails['password']);
+
+				if (userDetails['administrator']) {
+					const admin = util.format(this.elements.administratorSelectOption.selector, administrator);
+					await this.waitForElementVisible('@administratorField')
+						.click('@administratorField')
+						.waitForElementVisible(admin)
+						.click(admin);
+				}
+
+				if (userDetails['gender']) {
+					const genderValue = util.format(this.elements.genderSelectOption.selector, gender)
+					await this.waitForElementVisible('@genderField')
+						.click('@genderField')
+						.waitForElementVisible(genderValue)
+						.click(genderValue);
+				}
+				return this.waitForElementVisible('@submitButton')
+					.click('@submitButton')
+					.useCss();
+			},
+
+			noPermissionMessage: async function (message) {
+				await this.useXpath()
+					.waitForElementVisible('@noPermissionDefinedMessage')
+					.expect.element('@noPermissionDefinedMessage')
+					.text.to.equal(message);
+				return this.useCss();
+			},
+
+			newUserShouldBeCreated: async function (lastname) {
+				await this.useXpath()
+					.waitForElementVisible('@newUserCreated')
+					.expect.element('@newUserCreated')
+					.text.to.equal(lastname);
+				return this.useCss();
+			},
+
+			noPermissionDefinedMessageNotShown: function (message) {
+				return this.useXpath()
+					.waitForElementNotPresent('@noPermissionDefinedMessage')
+					.useCss();
+			},
+
+			userNotCreated: function (lastname) {
+				return this.waitForElementVisible('@newUserAddOption');
+			}
+		}
+	],
+
+	elements: {
+		newUserAddOption: {
+			selector: '.fiche'
+		},
+
+		lastnameField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@id="lastname"]',
+			locateStrategy: 'xpath'
+		},
+
+		loginField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@name="login"]',
+			locateStrategy: 'xpath'
+		},
+
+		newUserPasswordField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//input[@name="password"]',
+			locateStrategy: 'xpath'
+		},
+
+		submitButton: {
+			selector: '//div[@class="center"]/input[@class="button"]',
+			locateStrategy: 'xpath'
+		},
+
+		administratorField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//select[@id="admin"]',
+			locateStrategy: 'xpath'
+		},
+
+		administratorSelectOption: {
+			selector: '//select[@id="admin"]/option[.="%s"]',
+			locateStrategy: 'xpath'
+
+		},
+
+		genderField: {
+			selector: '//table[@class="border centpercent"]/tbody/tr/td//select[@id="gender"]',
+			locateStrategy: 'xpath'
+		},
+		genderSelectOption: {
+			selector: '//select[@id="gender"]/option[.="%s"]',
+			locateStrategy: 'xpath'
+		},
+
+		noPermissionDefinedMessage: {
+			selector: '//div[@class="jnotify-message"]',
+			locateStrategy: 'xpath'
+		},
+
+		newUserCreated: {
+			selector: '//div[contains(@class,"valignmiddle")]//div[contains(@class,"inline-block floatleft valignmiddle")]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/pageObjects/homePage.js b/test/acceptance/pageObjects/homePage.js
new file mode 100644
index 00000000000..7c225e90f5a
--- /dev/null
+++ b/test/acceptance/pageObjects/homePage.js
@@ -0,0 +1,44 @@
+module.exports = {
+	url: function () {
+		return this.api.launchUrl + 'admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete';
+	},
+
+	commands: [
+		{
+			browsedToNewUserPage: function () {
+				return this.useXpath()
+					.waitForElementVisible('@usersAndGroups')
+					.click('@usersAndGroups')
+					.waitForElementVisible('@newUser')
+					.click('@newUser')
+					.useCss();
+			},
+
+			browsedToListOfUsers: function () {
+				return this.useXpath()
+					.waitForElementVisible('@usersAndGroups')
+					.click('@usersAndGroups')
+					.waitForElementVisible('@listOfUsers')
+					.click('@listOfUsers')
+					.useCss();
+			}
+		}
+	],
+
+	elements: {
+		usersAndGroups: {
+			selector: '//div[@class="menu_titre"]/a[@title="Users & Groups"]',
+			locateStrategy: 'xpath'
+		},
+
+		newUser: {
+			selector: '//div[@class="menu_contenu menu_contenu_user_card"]/a[@title="New user"]',
+			locateStrategy: 'xpath'
+		},
+
+		listOfUsers: {
+			selector: '//a[@class="vsmenu"][@title="List of users"]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/pageObjects/listUsersPage.js b/test/acceptance/pageObjects/listUsersPage.js
new file mode 100644
index 00000000000..3567bb576ab
--- /dev/null
+++ b/test/acceptance/pageObjects/listUsersPage.js
@@ -0,0 +1,47 @@
+const util = require('util');
+module.exports = {
+	url: function () {
+		return this.api.launchUrl + 'user/list.php?leftmenu=users';
+	},
+
+	commands: [
+		{
+			listOfUsersDisplayed: async function (dataTable) {
+				const usersList = dataTable.hashes();
+				this.useXpath();
+				for (const row of usersList) {
+					let login = row['login'];
+					let lastName = row['last name'];
+					const userDetail = util.format(this.elements.userList.selector, login, lastName);
+					await this.waitForElementVisible('@userRow')
+						.waitForElementVisible(userDetail);
+				}
+				return this.useCss();
+			},
+
+			numberOfUsersDisplayed: async function (number) {
+				const userCount = util.format(this.elements.numberOfUsers.selector, number);
+				await this.useXpath()
+					.waitForElementVisible(userCount);
+				return this.useCss();
+			}
+		}
+	],
+
+	elements: {
+		userRow: {
+			selector: '//table[contains(@class,"tagtable")]/tbody/tr[position()>2]',
+			locateStrategy: 'xpath'
+		},
+
+		numberOfUsers: {
+			selector: '//div[contains(@class, "titre inline-block") and contains(., "List of users")]/span[.="(%d)"]',
+			locateStrategy: 'xpath'
+		},
+
+		userList: {
+			selector: '//table[contains(@class,"tagtable")]/tbody/tr[position()>2]/td/a//span[normalize-space(@class="nopadding usertext")][.="%s"]/../../following-sibling::td[.="%s"]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/pageObjects/loginPage.js b/test/acceptance/pageObjects/loginPage.js
new file mode 100644
index 00000000000..b95fd1645ab
--- /dev/null
+++ b/test/acceptance/pageObjects/loginPage.js
@@ -0,0 +1,84 @@
+module.exports = {
+	url: function () {
+		return this.api.launchUrl;
+	},
+
+	commands: [
+		{
+			waitForLoginPage: function () {
+				return this.waitForElementVisible('@loginTable');
+			},
+
+			userLogsInWithUsernameAndPassword: function (username, password) {
+				return this.waitForElementVisible('@userNameField')
+					.setValue('@userNameField', username)
+					.waitForElementVisible('@passwordField')
+					.setValue('@passwordField', password)
+					.useXpath()
+					.waitForElementVisible('@loginButton')
+					.click('@loginButton')
+					.useCss();
+			},
+
+			successfulLogin: function () {
+				return this.waitForElementNotPresent('@loginTable')
+					.waitForElementVisible('@userProfileDropdown');
+			},
+
+			userIsLoggedIn: async function (login) {
+				await this.waitForElementNotPresent('@loginTable')
+					.useXpath()
+					.waitForElementVisible('@userLogin')
+					.expect.element('@userLogin')
+					.text.to.equal(login);
+				return this.useCss();
+			},
+
+			unsuccessfulLogin: function () {
+				return this.waitForElementVisible('@loginTable')
+					.waitForElementNotPresent('@userProfileDropdown');
+			},
+
+			loginErrorDisplayed: async function (errorMessage) {
+				await this.useXpath()
+					.waitForElementVisible('@loginError')
+					.expect.element('@loginError')
+					.text.to.equal(errorMessage);
+				return this.useCss();
+			}
+		}
+	],
+
+	elements: {
+		loginButton: {
+			selector: '//div[@id="login-submit-wrapper"]/input[@type="submit"]',
+			locateStrategy: 'xpath'
+		},
+
+		userNameField: {
+			selector: '#username'
+		},
+
+		passwordField: {
+			selector: '#password'
+		},
+
+		loginTable: {
+			selector: '.login_table'
+		},
+
+		userProfileDropdown: {
+			selector: '#topmenu-login-dropdown'
+		},
+
+		userLogin: {
+			selector: '//div[@id="topmenu-login-dropdown"]/a//span[contains(@class,"atoploginusername")]',
+			locateStrategy: 'xpath'
+		},
+
+		loginError: {
+			selector: '//div[@class="center login_main_message"]/div[@class="error"]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/pageObjects/logoutPage.js b/test/acceptance/pageObjects/logoutPage.js
new file mode 100644
index 00000000000..a63b8415238
--- /dev/null
+++ b/test/acceptance/pageObjects/logoutPage.js
@@ -0,0 +1,34 @@
+module.exports = {
+	url: function () {
+		return this.api.launchUrl + 'admin/index.php?mainmenu=home&leftmenu=setup&mesg=setupnotcomplete';
+	},
+
+	commands:
+		[
+			{
+				userOpensProfile: async function () {
+					await this.useXpath()
+						.waitForElementVisible('@userProfileDropdown')
+						.click('@userProfileDropdown')
+					return this.useCss();
+				},
+
+				userLogsOut: function () {
+					return this.waitForElementVisible('@logoutButton')
+						.click('@logoutButton');
+				}
+			}
+		],
+
+	elements: {
+
+		logoutButton: {
+			selector: '.pull-right'
+		},
+
+		userProfileDropdown: {
+			selector: '//div[@id="topmenu-login-dropdown"]',
+			locateStrategy: 'xpath'
+		}
+	}
+};
diff --git a/test/acceptance/setup.js b/test/acceptance/setup.js
new file mode 100644
index 00000000000..123d6b3c5ec
--- /dev/null
+++ b/test/acceptance/setup.js
@@ -0,0 +1,77 @@
+const { Before, After } = require('cucumber');
+const { client } = require('nightwatch-api');
+const fetch = require('node-fetch');
+let initialUsers = {};
+let dolApiKey = '';
+
+const getUsers = async function () {
+    const header = {};
+    const url = client.globals.backend_url + 'api/index.php/users';
+    const users = {};
+    header['Accept'] = 'application/json';
+    header['DOLAPIKEY'] = dolApiKey;
+    await fetch(url, {
+        method: 'GET',
+        headers: header
+    })
+        .then(async (response) => {
+            const json_response = await response.json();
+            for (const user of json_response) {
+                users[user.id] = user.id;
+            }
+        });
+    return users;
+};
+
+Before(async function getDolApiKey() {
+	const header = {}
+	const adminUsername = client.globals.adminUsername;
+	const adminPassword = client.globals.adminPassword;
+	const params = new URLSearchParams()
+	params.set('login', adminUsername)
+	params.set('password', adminPassword)
+	const apiKey = client.globals.backend_url + `api/index.php/login?${params.toString()}`;
+	header['Accept'] = 'application/json'
+	await fetch(apiKey, {
+		method: 'GET',
+		headers: header
+	})
+		.then(async (response) => {
+			const jsonResponse = await response.json()
+			dolApiKey = jsonResponse['success']['token']
+			client.globals.dolApiKey = dolApiKey
+		})
+})
+
+Before(async () => {
+	initialUsers = await getUsers();
+});
+
+After(async () => {
+	const finalUsers = await getUsers();
+	const header = {};
+	const url = client.globals.backend_url + 'api/index.php/users/';
+	header['Accept'] = 'application/json';
+	header['DOLAPIKEY'] = dolApiKey;
+	let found;
+	for (const finaluser in finalUsers) {
+		for (const initialuser in initialUsers) {
+			found = false;
+			if (initialuser === finaluser) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			await fetch(url + finaluser, {
+				method: 'DELETE',
+				headers: header
+			})
+				.then(res => {
+					if (res.status < 200 || res.status >= 400) {
+						throw new Error("Failed to delete user: " + res.statusText);
+					}
+				});
+		}
+	}
+});
diff --git a/test/acceptance/stepDefinitions/addUsersContext.js b/test/acceptance/stepDefinitions/addUsersContext.js
new file mode 100644
index 00000000000..076c5d24226
--- /dev/null
+++ b/test/acceptance/stepDefinitions/addUsersContext.js
@@ -0,0 +1,150 @@
+const {Given, When, Then} = require('cucumber');
+const {client} = require('nightwatch-api');
+const fetch = require('node-fetch');
+const assert = require('assert');
+let response;
+let Login = {};
+
+Given('the administrator has browsed to the new users page', function () {
+    return client.page.homePage().browsedToNewUserPage();
+});
+
+When('the admin creates user with following details', function (datatable) {
+    return client.page.addUsersPage().adminCreatesUser(datatable);
+});
+
+Then('new user {string} should be created', function (lastname) {
+    return client.page.addUsersPage().newUserShouldBeCreated(lastname);
+});
+
+Then('message {string} should be displayed in the webUI', function (message) {
+    return client.page.addUsersPage().noPermissionMessage(message);
+});
+
+Then('message {string} should not be displayed in the webUI', function (message) {
+    return client.page.addUsersPage().noPermissionDefinedMessageNotShown(message);
+});
+
+Then('new user {string} should not be created', function (lastname) {
+    return client.page.addUsersPage().userNotCreated(lastname);
+});
+
+Given('a user has been created with following details', function (dataTable) {
+    return adminHasCreatedUser(dataTable);
+});
+
+Given('the admin has created the following users', function (dataTable) {
+    return adminHasCreatedUser(dataTable);
+});
+
+When('the admin creates user with following details using API', function (dataTable) {
+    return adminCreatesUserWithAPI(dataTable);
+});
+
+Given('the user with login {string} does not exist', async function (login) {
+    await userDoesNotExist(login);
+});
+
+Then('the response status code should be {string}', function (expectedStatusCode) {
+    return getStatusCode(expectedStatusCode);
+});
+
+Then('user with login {string} should exist', function (login) {
+    return userShouldExist(login);
+});
+
+Then('the response message should be {string}', function (expectedResponseMessage) {
+    return getResponseMessage(expectedResponseMessage);
+});
+
+const createUserRequest = function (login, lastname, password) {
+    const header = {};
+    const url = client.globals.backend_url + 'api/index.php/users';
+    header['Accept'] = 'application/json';
+    header['DOLAPIKEY'] = client.globals.dolApiKey;
+    header['Content-Type'] = 'application/json';
+    return fetch(url, {
+        method: 'POST',
+        headers: header,
+        body: JSON.stringify(
+            {
+                login: login,
+                lastname: lastname,
+                pass: password
+            }
+        )
+    });
+};
+
+const adminCreatesUserWithAPI = function (dataTable) {
+    const userDetails = dataTable.rowsHash();
+    return createUserRequest(userDetails['login'], userDetails['last name'], userDetails['password'])
+        .then((res) => {
+            response = res;
+        });
+};
+
+const adminHasCreatedUser = async function (dataTable) {
+    const userDetails = dataTable.hashes();
+    for (const user of userDetails) {
+        await createUserRequest(user['login'], user['last name'], user['password'])
+            .then((response) => {
+                if (response.status < 200 || response.status >= 400) {
+                    throw new Error('Failed to create user: ' + user['login'] +
+                        ' ' + response.statusText);
+                }
+            });
+    }
+};
+
+const getUsersLogin = async function () {
+    const header = {};
+    const url = client.globals.backend_url + 'api/index.php/users/';
+    header['Accept'] = 'application/json';
+    header['DOLAPIKEY'] = client.globals.dolApiKey;
+    header['Content-Type'] = 'application/json';
+    await fetch(url, {
+        method: 'GET',
+        headers: header
+    })
+        .then(async (response) => {
+            const json_response = await response.json();
+            for (const user of json_response) {
+                Login[user.login] = user.login;
+            }
+        });
+};
+
+const userDoesNotExist = async function (login) {
+    await getUsersLogin();
+    if (login in Login) {
+        Login = {};
+        throw new Error(`user ${login} exists`);
+    }
+    Login = {};
+    return;
+};
+
+const userShouldExist = async function (login) {
+    await getUsersLogin();
+    if (login in Login) {
+        Login = {};
+        return;
+    } else {
+        Login = {};
+        throw new Error(`User ${login} does not Exist`);
+    }
+};
+
+const getStatusCode = async function (expectedStatusCode) {
+    const actualStatusCode = response.status.toString();
+    return assert.strictEqual(actualStatusCode, expectedStatusCode,
+        `The expected status code was ${expectedStatusCode} but got ${actualStatusCode}`);
+};
+
+const getResponseMessage = async function (expectedResponseMessage) {
+    const json_response = await response.json();
+    const actualResponseMessage = json_response['error']['0'];
+    return assert.strictEqual(actualResponseMessage, expectedResponseMessage,
+        `the expected response message was ${expectedResponseMessage} but got ${actualResponseMessage}`);
+};
diff --git a/test/acceptance/stepDefinitions/listUsersContext.js b/test/acceptance/stepDefinitions/listUsersContext.js
new file mode 100644
index 00000000000..78912abd3a0
--- /dev/null
+++ b/test/acceptance/stepDefinitions/listUsersContext.js
@@ -0,0 +1,14 @@
+const { When, Then } = require('cucumber');
+const { client } = require('nightwatch-api');
+
+When('the administrator browses to the list of users page using the webUI', function () {
+	return client.page.homePage().browsedToListOfUsers();
+});
+
+Then('following users should be displayed in the users list', function (dataTable) {
+	return client.page.listUsersPage().listOfUsersDisplayed(dataTable);
+});
+
+Then('the number of created users should be {int}', function (number) {
+	return client.page.listUsersPage().numberOfUsersDisplayed(number);
+});
diff --git a/test/acceptance/stepDefinitions/loginContext.js b/test/acceptance/stepDefinitions/loginContext.js
new file mode 100644
index 00000000000..ea9aa07949b
--- /dev/null
+++ b/test/acceptance/stepDefinitions/loginContext.js
@@ -0,0 +1,28 @@
+const { Given, When, Then } = require('cucumber')
+const { client } = require('nightwatch-api')
+
+Given('the administrator has logged in using the webUI', async function () {
+	await client.page.loginPage().navigate().waitForLoginPage();
+	await client.page.loginPage().userLogsInWithUsernameAndPassword(client.globals.adminUsername, client.globals.adminPassword);
+	return client.page.loginPage().userIsLoggedIn(client.globals.adminUsername);
+});
+
+Given('the user has browsed to the login page', function () {
+	return client.page.loginPage().navigate();
+});
+
+When('user logs in with username {string} and password {string}', function (username, password) {
+	return client.page.loginPage().userLogsInWithUsernameAndPassword(username, password);
+});
+
+Then('the user should be directed to the homepage', function () {
+	return client.page.loginPage().successfulLogin();
+});
+
+Then('the user should not be able to login', function () {
+	return client.page.loginPage().unsuccessfulLogin();
+});
+
+Then('error message {string} should be displayed in the webUI', function (errormessage) {
+	return client.page.loginPage().loginErrorDisplayed(errormessage);
+});
diff --git a/test/acceptance/stepDefinitions/logoutContext.js b/test/acceptance/stepDefinitions/logoutContext.js
new file mode 100644
index 00000000000..018bf566cfb
--- /dev/null
+++ b/test/acceptance/stepDefinitions/logoutContext.js
@@ -0,0 +1,14 @@
+const { When, Then } = require('cucumber');
+const { client } = require('nightwatch-api');
+
+When('the user opens the user profile using the webUI', function () {
+	return client.page.logoutPage().userOpensProfile();
+});
+
+When('the user logs out using the webUI', function () {
+	return client.page.logoutPage().userLogsOut();
+});
+
+Then('the user should be logged out successfully', function () {
+	return client.page.loginPage().waitForLoginPage();
+});
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index b819671578c..4326f536f92 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -341,7 +341,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
             $ok=true;
             $matches=array();
             // Check string   name="token" value="'.$_SESSINON
-            preg_match_all('/name="token" value="\'\.\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
+            preg_match_all('/name="token" value="\'\s*\.\s*\$_SESSION/', $filecontent, $matches, PREG_SET_ORDER);
             foreach ($matches as $key => $val)
             {
             	if ($file['name'] != 'excludefile.php')
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index d113cde8035..2cb4d98610c 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -1257,9 +1257,6 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 
         $conf->global->MAIN_START_WEEK = 0;
 
-        $tmp=dol_getdate(1);				// 1/1/1970 and 1 second = thirday
-        $this->assertEquals(4, $tmp['wday']);
-
         $tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
         $this->assertEquals(5, $tmp['wday']);
 
@@ -1271,12 +1268,77 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
         $tmp=dol_getdate(24*60*60+1);		// 2/1/1970 and 1 second = friday
         $this->assertEquals(5, $tmp['wday']);
 
+        $tmp=dol_getdate(1, false, "Europe/Paris");						// 1/1/1970 and 1 second = thirday
+        $this->assertEquals(1970, $tmp['year']);
+        $this->assertEquals(1, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(4, $tmp['wday']);
+        $this->assertEquals(0, $tmp['yday']);
+        $this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $tmp=dol_getdate(15638401, false, "Europe/Paris");					// 1/7/1970 and 1 second = wednesday
+        $this->assertEquals(1970, $tmp['year']);
+        $this->assertEquals(7, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(3, $tmp['wday']);
+        $this->assertEquals(181, $tmp['yday']);
+        $this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $tmp=dol_getdate(1593561601, false, "Europe/Paris");				// 1/7/2020 and 1 second = wednesday
+        $this->assertEquals(2020, $tmp['year']);
+        $this->assertEquals(7, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(3, $tmp['wday']);
+        $this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
+        $this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $conf->global->MAIN_USE_OLD_FUNCTIONS_FOR_GETDATE = 1;
+
+        $tmp=dol_getdate(1);						// 1/1/1970 and 1 second = thirday
+        $this->assertEquals(1970, $tmp['year']);
+        $this->assertEquals(1, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(4, $tmp['wday']);
+        $this->assertEquals(0, $tmp['yday']);
+        // We must disable this because on CI, timezone is may be UTC or something else
+        //$this->assertEquals(1, $tmp['hours']);		// We are winter, so we are GMT+1 even during summer
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $tmp=dol_getdate(15638401);					// 1/7/1970 and 1 second = wednesday
+        $this->assertEquals(1970, $tmp['year']);
+        $this->assertEquals(7, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(3, $tmp['wday']);
+        $this->assertEquals(181, $tmp['yday']);
+        // We must disable this because on CI, timezone is may be UTC or something else
+        //$this->assertEquals(1, $tmp['hours']);		// There is no daylight in 1970, so we are GMT+1 even during summer
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
+        $tmp=dol_getdate(1593561601);				// 1/7/2020 and 1 second = wednesday
+        $this->assertEquals(2020, $tmp['year']);
+        $this->assertEquals(7, $tmp['mon']);
+        $this->assertEquals(1, $tmp['mday']);
+        $this->assertEquals(3, $tmp['wday']);
+        $this->assertEquals(182, $tmp['yday']);		// 182 and not 181, due to the 29th february
+        // We must disable this because on CI, timezone is may be UTC or something else
+        //$this->assertEquals(2, $tmp['hours']);		// There is a daylight, so we are GMT+2
+        $this->assertEquals(0, $tmp['minutes']);
+        $this->assertEquals(1, $tmp['seconds']);
+
         return true;
     }
 
 
     /**
-     * testDolGetDate
+     * testMakeSubstitutions
      *
      * @return boolean
      */
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 6c4d2270d1a..4430b377b26 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -294,6 +294,46 @@ class SecurityTest extends PHPUnit\Framework\TestCase
         return 0;
     }
 
+    /**
+     * testDolStringOnlyTheseHtmlTags
+     *
+     * @return number
+     */
+    public function testDolHTMLEntityDecode()
+    {
+    	$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
+    	$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES);
+    	$this->assertEquals('a &colon; b " c \' d &apos; e é', $decodedstring, 'Function did not sanitize correclty');
+
+    	$stringtotest = 'a &colon; b &quot; c &#039; d &apos; e &eacute;';
+    	$decodedstring = dol_html_entity_decode($stringtotest, ENT_QUOTES|ENT_HTML5);
+    	$this->assertEquals('a : b " c \' d \' e é', $decodedstring, 'Function did not sanitize correclty');
+
+    	return 0;
+    }
+
+    /**
+     * testDolStringOnlyTheseHtmlTags
+     *
+     * @return number
+     */
+    public function testDolStringOnlyTheseHtmlTags()
+    {
+    	$stringtotest = '<a href="javascript:aaa">bbbڴ';
+    	$decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 1');
+
+        $stringtotest = '<a href="java'.chr(0).'script:aaa">bbbڴ';
+        $decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 2');
+
+        $stringtotest = '<a href="javascript&colon;aaa">bbbڴ';
+        $decodedstring = dol_string_onlythesehtmltags($stringtotest, 1, 1, 1);
+        $this->assertEquals('<a href="aaa">bbbڴ', $decodedstring, 'Function did not sanitize correclty with test 3');
+
+        return 0;
+    }
+
     /**
      * testGetRandomPassword
      *