diff --git a/.github/workflows/stale-issues-safe.yml b/.github/workflows/stale-issues-safe.yml
index 55599654707..ed37c9aadc2 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 15 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)'
+        exempt-labels: 'Priority High / Blocking,Priority Top Strategic,Priority Medium,Hacktoberfest,good first issue,Bug Security (CVE),Analysis of PR in progres'
         days-before-stale: 365
         days-before-close: 15
         operations-per-run: 100
diff --git a/.travis.yml b/.travis.yml
index 613d2fa2420..688d706331d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -282,7 +282,7 @@ script:
   # Ensure we catch errors
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
-  parallel-lint --exclude dev/namespacemig --exclude dev/initdata/dbf/includes --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame .
+  parallel-lint --exclude dev/namespacemig --exclude htdocs/includes/myclabs --exclude htdocs/includes/webmozart --exclude htdocs/includes/phpspec --exclude dev/initdata/dbf/includes --exclude htdocs/includes/sabre --exclude htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared --exclude htdocs/includes/phpoffice/PhpSpreadsheet --exclude htdocs/includes/sebastian --exclude htdocs/includes/squizlabs/php_codesniffer --exclude htdocs/includes/jakub-onderka --exclude htdocs/includes/mike42/escpos-php/example --exclude htdocs/includes/phpunit/ --exclude htdocs/includes/composer/autoload_static.php --blame .
   set +e
   echo
 
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index 994beb95eff..b9a6b837d7f 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -102,10 +102,13 @@ Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversi
 ; Put here path of Wampserver applications
 ; Value OK: apache 2.2.6,  php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
 ; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
-; Value OK: apache 2.4.19, php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
+; Value OK: apache 2.4.9,  php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
+; Value To test: apache 2.4.41, php 7.3.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
 Source: "C:\Program Files\Wamp\apps\phpmyadmin4.1.14\*.*"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
-Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+;Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\apache\apache2.4.41\*.*"; DestDir: "{app}\bin\apache\apache2.4.41"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+;Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\php\php7.3.12\*.*"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
 Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 ; Mysql data files (does not overwrite if exists)
 Source: "build\exe\doliwamp\mysql\*.*"; DestDir: "{app}\bin\mysql\data\mysql"; Flags: onlyifdoesntexist ignoreversion recursesubdirs; Excludes: ".gitignore,.project,CVS\*,Thumbs.db"
@@ -119,9 +122,11 @@ Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".
 Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
+;Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.41\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
+;Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -227,8 +232,10 @@ procedure InitializeWizard();
 begin
 
   //version des applis, a modifier pour chaque version de WampServer 2
-  apacheVersion := '2.4.9';
-  phpVersion := '5.5.12' ;
+  //apacheVersion := '2.4.9';
+  //phpVersion := '5.5.12' ;
+  apacheVersion := '2.4.41';
+  phpVersion := '7.3.12' ;
   mysqlVersion := '5.0.45';
   phpmyadminVersion := '4.1.14';
 
@@ -392,40 +399,42 @@ begin
     //----------------------------------------------
 	// TODO Update this list when changing PHP/Apache versions
 	
-    phpDllCopy := 'fdftk.dll';
+//    phpDllCopy := 'fdftk.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'fribidi.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'gds32.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'libeay32.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'libmhash.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'libmysql.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'libpq.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'msql.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'libmcrypt.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'libmysqli.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'ntwdblib.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+
+//    phpDllCopy := 'php5activescript.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'php5nsapi.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+    phpDllCopy := 'php7apache2_4.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'fribidi.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'gds32.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libeay32.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmhash.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmysql.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libpq.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'msql.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmcrypt.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'libmysqli.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'ntwdblib.dll';
+    phpDllCopy := 'php7ts.dll';
     filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
 
-    phpDllCopy := 'php5activescript.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php5nsapi.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'php5ts.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-
-    phpDllCopy := 'ssleay32.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
-    phpDllCopy := 'yaz.dll';
-    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'ssleay32.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
+//    phpDllCopy := 'yaz.dll';
+//    filecopy (pathWithSlashes+'/bin/php/php'+phpVersion+'/'+phpDllCopy, pathWithSlashes+'/bin/apache/apache'+apacheVersion+'/bin/'+phpDllCopy, False);
 
 
     // Remove lock file
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index f68ca6a77f5..c6b8cd330c8 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -2,7 +2,7 @@
 #----------------------------------------------------------------------------
 # \file         build/makepack-dolibarr.pl
 # \brief        Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
-# \author       (c)2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+# \author       (c)2004-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
 #
 # This is list of constant you can set to have generated packages moved into a specific dir: 
 #DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'
@@ -430,12 +430,14 @@ if ($nboftargetok) {
 				$ret=`git tag -a -f -m "$MAJOR.$MINOR.$BUILD" "$MAJOR.$MINOR.$BUILD"`;
 				print 'Run git push -f --tags'."\n";
 				$ret=`git push -f --tags`;
+				#$ret=`git push -f origin "$MAJOR.$MINOR.$BUILD"`;
 			}
 		}
 		else
 		{
 			print 'Run git push --tags'."\n";
 			$ret=`git push --tags`;
+			#$ret=`git push origin "$MAJOR.$MINOR.$BUILD"`;
 		}
 		chdir("$olddir");
 	}
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index e50112f7ff1..065a72a5257 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -622,7 +622,7 @@ if ($action == 'delbookkeepingyear') {
 			'default' => $deljournal
 	);
 
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, 0, 1, 300);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt'), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
 	print $formconfirm;
 }
 
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
index 1dfb324599c..1a212c00b84 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
@@ -197,7 +197,7 @@ if ($resql) {
 
     $param="&socid=".$socid;
 	print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '" method="POST">';
-    print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+    print '<input type="hidden" name="token" value="' . newToken() . '">';
 	print '<input type="hidden" name="socid" value="' . $object->id . '">';
 
     $letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
index 5a5a4d36c21..f71b41a9c28 100644
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
@@ -195,7 +195,7 @@ if ($resql) {
 
     $param="&socid=".$socid;
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid=' . $object->id . '" method="POST">';
-    print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+    print '<input type="hidden" name="token" value="' . newToken() . '">';
 	print '<input type="hidden" name="socid" value="' . $object->id . '">';
 
     $letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index 2012efe0eb9..97d62ebb5dc 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -230,7 +230,7 @@ class Lettering extends BookKeeping
 	 *
 	 * @param array $ids ids array
 	 * @param boolean $notrigger no trigger
- 	 * @return number
+	 * @return number
 	 */
 	public function updateLettering($ids = array(), $notrigger = false)
 	{
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 55342a98c27..7e51160195b 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -332,7 +332,7 @@ if ($result) {
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "fd.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	$clickpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($clickpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
@@ -341,7 +341,7 @@ if ($result) {
 	$product_static = new Product($db);
 
 	while ($objp = $db->fetch_object($result)) {
-		$codecompta = length_accountg($objp->account_number).' - '.$objp->label_compte;
+		$codecompta = length_accountg($objp->account_number).' - <span class="opacitymedium">'.$objp->label_compte.'</span>';
 
 		$facture_static->ref = $objp->ref;
 		$facture_static->id = $objp->facid;
@@ -390,7 +390,7 @@ if ($result) {
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
-		print '<td class="center">';
+		print '<td>';
 		print $codecompta.' <a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a>';
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index 63b142e1bdd..8cc398a00bf 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -287,7 +287,7 @@ if ($result) {
 
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
-		$codeCompta = length_accountg($objp->account_number).' - '.$objp->label;
+		$codeCompta = length_accountg($objp->account_number).' - <span class="opacitymedium">'.$objp->label.'</span>';
 
 		$expensereport_static->ref = $objp->ref;
 		$expensereport_static->id = $objp->erid;
@@ -315,7 +315,7 @@ if ($result) {
 
 		print '<td>'.$codeCompta.'</td>';
 
-		print '<td class="left"><a href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
+		print '<td class="left"><a class="editfielda" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
 
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index ef44222568f..8d3f3937823 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -336,7 +336,7 @@ if ($result) {
 	print_liste_field_titre("VATRate", $_SERVER["PHP_SELF"], "l.tva_tx", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre("Country", $_SERVER["PHP_SELF"], "co.label", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATIntra", $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre("Account", $_SERVER["PHP_SELF"], "aa.account_number", "", $param, '', $sortfield, $sortorder);
 	$checkpicto = $form->showCheckAddButtons();
 	print_liste_field_titre($checkpicto, '', '', '', '', '', '', '', 'center ');
 	print "</tr>\n";
@@ -347,7 +347,7 @@ if ($result) {
 	while ($i < min($num_lines, $limit)) {
 		$objp = $db->fetch_object($result);
 
-		$codecompta = length_accountg($objp->account_number).' - '.$objp->label;
+		$codecompta = length_accountg($objp->account_number).' - <span class="opacitymedium">'.$objp->label.'</span>';
 
 		$facturefournisseur_static->ref = $objp->ref;
 		$facturefournisseur_static->id = $objp->facid;
@@ -399,7 +399,7 @@ if ($result) {
 
 		print '<td>'.$objp->tva_intra.'</td>';
 
-		print '<td class="center">';
+		print '<td>';
 		print $codecompta.' <a href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
diff --git a/htdocs/adherents/admin/adherent_type_extrafields.php b/htdocs/adherents/admin/adherent_type_extrafields.php
index 3e091acdfda..cd73320d02d 100644
--- a/htdocs/adherents/admin/adherent_type_extrafields.php
+++ b/htdocs/adherents/admin/adherent_type_extrafields.php
@@ -100,7 +100,7 @@ if ($action == 'create')
 	print "<br>";
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -113,7 +113,7 @@ 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';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index e7686a0a055..6736a22cd5d 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -259,7 +259,7 @@ print '<br>';
 
 print img_picto('', 'puce').' '.$langs->trans("DocForAllMembersCards", ($conf->global->ADHERENT_CARD_TYPE?$conf->global->ADHERENT_CARD_TYPE:$langs->transnoentitiesnoconv("None"))).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+print '<input type="hidden" name="token" value="' . newToken() . '">';
 print '<input type="hidden" name="foruserid" value="all">';
 print '<input type="hidden" name="mode" value="card">';
 print '<input type="hidden" name="action" value="builddoc">';
@@ -279,7 +279,7 @@ print '<br><br>';
 
 print img_picto('', 'puce').' '.$langs->trans("DocForOneMemberCards", ($conf->global->ADHERENT_CARD_TYPE?$conf->global->ADHERENT_CARD_TYPE:$langs->transnoentitiesnoconv("None"))).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+print '<input type="hidden" name="token" value="' . newToken() . '">';
 print '<input type="hidden" name="mode" value="cardlogin">';
 print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_CARD_TYPE").' ';
@@ -299,7 +299,7 @@ print '<br><br>';
 
 print img_picto('', 'puce').' '.$langs->trans("DocForLabels", $conf->global->ADHERENT_ETIQUETTE_TYPE).' ';
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+print '<input type="hidden" name="token" value="' . newToken() . '">';
 print '<input type="hidden" name="mode" value="label">';
 print '<input type="hidden" name="action" value="builddoc">';
 print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' ';
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 68989ee3ef9..969117c4bdc 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -297,7 +297,7 @@ if (!$rowid && $action != 'create' && $action != 'edit')
 			print '<td class="center">'.yn($objp->vote).'</td>';
 			print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
 			if ($user->rights->adherent->configurer)
-				print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
+				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
 			else
 				print '<td class="right">&nbsp;</td>';
 			print "</tr>";
@@ -607,7 +607,7 @@ if ($rowid > 0)
 		    }
 
 			print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-            print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+            print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input class="flat" type="hidden" name="rowid" value="'.$object->id.'" size="12"></td>';
 
 			print '<br>';
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 83c143e4955..b5a6e2e3dfe 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -110,56 +110,60 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="update">';
 
 print '<table class="noborder centpercent">';
-print '<tr class="oddeven liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
+print '<tr class="liste_titre"><th class="titlefield wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
 // Name
-print '<tr><td class="fieldrequired"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
 print '<input name="nom" id="name" class="minwidth200" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_NAME?$conf->global->MAIN_INFO_ACCOUNTANT_NAME: GETPOST("nom", 'nohtml')) . '"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
 
 // Address
-print '<tr><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
 print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'. ($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS?$conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS: GETPOST("address", 'nohtml')) . '</textarea></td></tr>'."\n";
 
-print '<tr><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
 print '<input class="minwidth100" name="zipcode" id="zipcode" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_ZIP?$conf->global->MAIN_INFO_ACCOUNTANT_ZIP: GETPOST("zipcode", 'alpha')) . '"></td></tr>'."\n";
 
-print '<tr><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
 print '<input name="town" class="minwidth100" id="town" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_TOWN?$conf->global->MAIN_INFO_ACCOUNTANT_TOWN: GETPOST("town", 'nohtml')) . '"></td></tr>'."\n";
 
 // Country
-print '<tr><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
+print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
 //if (empty($country_selected)) $country_selected=substr($langs->defaultlang,-2);    // By default, country of localization
 print $form->select_country($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'country_id');
 if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 print '</td></tr>'."\n";
 
-print '<tr><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
+print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
 $formcompany->select_departement($conf->global->MAIN_INFO_ACCOUNTANT_STATE, $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY, 'state_id');
 print '</td></tr>'."\n";
 
-print '<tr><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
 print '<input name="tel" id="phone" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_PHONE . '"></td></tr>';
 print '</td></tr>'."\n";
 
-print '<tr><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
 print '<input name="fax" id="fax" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_FAX . '"></td></tr>';
 print '</td></tr>'."\n";
 
-print '<tr><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
 print '<input name="mail" id="email" class="minwidth200" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_MAIL . '"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
-print '<tr><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
 print '<input name="web" id="web" class="minwidth300" value="'. $conf->global->MAIN_INFO_ACCOUNTANT_WEB . '"></td></tr>';
 print '</td></tr>'."\n";
 
 // Code
-print '<tr><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
+print '<tr class="oddeven"><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
 print '<input name="code" id="code" class="minwidth100" value="'. ($conf->global->MAIN_INFO_ACCOUNTANT_CODE?$conf->global->MAIN_INFO_ACCOUNTANT_CODE: GETPOST("code", 'nohtml')) . '"></td></tr>'."\n";
 
 // Note
-print '<tr><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
+print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
 print '<textarea class="flat quatrevingtpercent" name="note" id="note" rows="'.ROWS_5.'">'.(GETPOST('note', 'none') ? GETPOST('note', 'none') : $conf->global->MAIN_INFO_ACCOUNTANT_NOTE).'</textarea></td></tr>';
 print '</td></tr>';
 
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 5338010772f..4960f044065 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -324,7 +324,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 }
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
-print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+print '<input type="hidden" name="token" value="' . newToken() . '">';
 print '<input type="hidden" name="action" value="set">';
 
 print '<table class="noborder allwidth">'."\n";
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 614d4ef4407..b641dd74fe2 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -180,7 +180,7 @@ $head=agenda_prepare_head();
 dol_fiche_head($head, 'reminders', $langs->trans("Agenda"), -1, 'action');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" name="agenda">';
-print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+print '<input type="hidden" name="token" value="' . newToken() . '">';
 print '<input type="hidden" name="action" value="set">';
 
 print '<table class="noborder allwidth">'."\n";
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index b63cecf340b..f5f0f6eb752 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -76,18 +76,18 @@ if ($action == 'set_BANK_CHEQUERECEIPT_FREE_TEXT')
 {
 	$freetext = GETPOST('BANK_CHEQUERECEIPT_FREE_TEXT', 'none');	// No alpha here, we want exact string
 
-    $res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "BANK_CHEQUERECEIPT_FREE_TEXT", $freetext, 'chaine', 0, '', $conf->entity);
 
 	if (! $res > 0) $error++;
 
  	if (! $error)
-    {
-        setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	{
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 /*
@@ -258,13 +258,13 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnChequeReceipts"), $lang
 $variablename='BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-    print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
 }
 else
 {
-    include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-    $doleditor=new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
-    print $doleditor->Create();
+	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor=new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	print $doleditor->Create();
 }
 print '</td><td class="right">';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 03c4eeb66cf..3fb3340a702 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -119,7 +119,7 @@ if (! empty($conf->global->CLICKTODIAL_URL))
 	if (GETPOST('phonefortest')) $phonefortest=GETPOST('phonefortest');
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'">';
-    print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+    print '<input type="hidden" name="token" value="' . newToken() . '">';
 	print $langs->trans("LinkToTestClickToDial", $user->login).' : ';
 	print '<input class="flat" type="text" name="phonefortest" value="'.dol_escape_htmltag($phonefortest).'">';
 	print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("RefreshPhoneLink")).'">';
diff --git a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
index 900d66c73b5..b7e874beec2 100644
--- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+++ b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
@@ -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\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -103,10 +103,10 @@ if ($action != 'create' && $action != 'edit')
 
 if ($action == 'create')
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print "<br>";
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -116,10 +116,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index b5ec2969f39..222cc292ace 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -451,27 +451,33 @@ print '</td></tr>'."\n";
 
 // Phone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
+print img_picto('', 'object_phoning', '', false, 0, 0, '', 'paddingright');
 print '<input name="tel" id="phone" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TEL).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
+print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'paddingright');
 print '<input name="fax" id="fax" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FAX).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Email
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
+print img_picto('', 'object_email', '', false, 0, 0, '', 'paddingright');
 print '<input name="mail" id="email" class="minwidth200" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_MAIL).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
+print img_picto('', 'globe', '', false, 0, 0, '', 'paddingright');
 print '<input name="web" id="web" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_WEB).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Barcode
 if (!empty($conf->barcode->enabled)) {
-	print '<tr class="oddeven"><td><label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
+	print '<tr class="oddeven"><td>';
+	print '<label for="barcode">'.$langs->trans("Gencod").'</label></td><td>';
+	print '<span class="fa paddingright fa-barcode"></span>';
 	print '<input name="barcode" id="barcode" class="minwidth150" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GENCOD).'"></td></tr>';
 	print '</td></tr>';
 }
@@ -480,15 +486,16 @@ if (!empty($conf->barcode->enabled)) {
 print '<tr class="oddeven"><td><label for="logo">'.$form->textwithpicto($langs->trans("Logo"), 'png, jpg').'</label></td><td>';
 print '<div class="centpertent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">';
 print '<input type="file" class="flat minwidth200" name="logo" id="logo" accept="image/*">';
-print '</div><div class="inline-block valignmiddle marginrightonly">';
+print '</div>';
 if (!empty($mysoc->logo_mini)) {
-	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
 	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {
-		print '</div><div class="inline-block valignmiddle">';
+		print '<div class="inline-block valignmiddle">';
 		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_mini).'">';
+		print '</div>';
 	}
+	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a></div>';
 } else {
-	print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+	print '<img height="60" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
 }
 print '</div>';
 print '</td></tr>';
@@ -497,15 +504,16 @@ print '</td></tr>';
 print '<tr class="oddeven"><td><label for="logo_squarred">'.$form->textwithpicto($langs->trans("LogoSquarred"), 'png, jpg').'</label></td><td>';
 print '<div class="centpertent nobordernopadding valignmiddle"><div class="inline-block marginrightonly">';
 print '<input type="file" class="flat minwidth200" name="logo_squarred" id="logo_squarred" accept="image/*">';
-print '</div><div class="inline-block valignmiddle marginrightonly">';
+print '</div>';
 if (!empty($mysoc->logo_squarred_mini)) {
-	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete")).'</a>';
 	if (file_exists($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_squarred_mini)) {
-		print '</div><div class="inline-block valignmiddle marginrightonly">';
+		print '<div class="inline-block valignmiddle marginrightonly">';
 		print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_squarred_mini).'">';
+		print '</div>';
 	}
+	print '<div class="inline-block valignmiddle marginrightonly"><a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=removelogosquarred">'.img_delete($langs->trans("Delete")).'</a></div>';
 } else {
-	print '<img height="30" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
+	print '<img height="60" src="'.DOL_URL_ROOT.'/public/theme/common/nophoto.png">';
 }
 print '</div>';
 print '</td></tr>';
@@ -524,35 +532,15 @@ print '<tr class="liste_titre">';
 print '<td class="titlefield">'.$langs->trans("SocialNetworksInformation").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-// Facebook
-print '<tr class="oddeven"><td><label for="facebookurl">'.$langs->trans("SocialNetworksFacebookURL").'</label></td><td>';
-print '<input name="facebookurl" id="facebookurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_FACEBOOK_URL).'"></td></tr>';
-print '</td></tr>'."\n";
-
-// Twitter
-print '<tr class="oddeven"><td><label for="twitterurl">'.$langs->trans("SocialNetworksTwitterURL").'</label></td><td>';
-print '<input name="twitterurl" id="twitterurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_TWITTER_URL).'"></td></tr>';
-print '</td></tr>'."\n";
-
-// LinkedIn
-print '<tr class="oddeven"><td><label for="linkedinurl">'.$langs->trans("SocialNetworksLinkedinURL").'</label></td><td>';
-print '<input name="linkedinurl" id="linkedinurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_LINKEDIN_URL).'"></td></tr>';
-print '</td></tr>'."\n";
-
-// Instagram
-print '<tr class="oddeven"><td><label for="instagramurl">'.$langs->trans("SocialNetworksInstagramURL").'</label></td><td>';
-print '<input name="instagramurl" id="instagramurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_INSTAGRAM_URL).'"></td></tr>';
-print '</td></tr>'."\n";
-
-// Youtube
-print '<tr class="oddeven"><td><label for="youtubeurl">'.$langs->trans("SocialNetworksYoutubeURL").'</label></td><td>';
-print '<input name="youtubeurl" id="youtubeurl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_YOUTUBE_URL).'"></td></tr>';
-print '</td></tr>'."\n";
-
-// Github
-print '<tr class="oddeven"><td><label for="githuburl">'.$langs->trans("SocialNetworksGithubURL").'</label></td><td>';
-print '<input name="githuburl" id="githuburl" class="minwidth300" value="'.dol_escape_htmltag($conf->global->MAIN_INFO_SOCIETE_GITHUB_URL).'"></td></tr>';
-print '</td></tr>'."\n";
+$listofnetworks = array('facebook'=>'facebook', 'twitter'=>'twitter', 'linkedin'=>'linkedin', 'instagram'=>'instagram', 'youtube'=>'youtube', 'github'=>'github');
+foreach($listofnetworks as $networkkey => $networkicon) {
+	print '<tr class="oddeven"><td>';
+	print '<label for="'.$networkkey.'url">'.$langs->trans("SocialNetworks".ucfirst($networkkey)."URL").'</label></td><td>';
+	$networkconst = 'MAIN_INFO_SOCIETE_'.strtoupper($networkkey).'_URL';
+	print '<span class="fa paddingright fa-'.($networkicon ? $networkicon : 'link').'"></span>';
+	print '<input name="'.$networkkey.'url" id="'.$networkkey.'url" class="minwidth300" value="'.dol_escape_htmltag($conf->global->$networkconst).'"></td></tr>';
+	print '</td></tr>'."\n";
+}
 
 print "</table>";
 
@@ -707,26 +695,24 @@ print "</table>";
 print '<br>';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td width="140">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
+print '<td width="25%">'.$langs->trans("VATManagement").'</td><td>'.$langs->trans("Description").'</td>';
 print '<td class="right">&nbsp;</td>';
 print "</tr>\n";
 
 
 print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"use_vat\" value=\"1\"".(empty($conf->global->FACTURE_TVAOPTION) ? "" : " checked")."> ".$langs->trans("VATIsUsed")."</label></td>";
 print '<td colspan="2">';
-print "<table>";
-print "<tr><td><label for=\"use_vat\">".$langs->trans("VATIsUsedDesc")."</label></td></tr>";
-if ($mysoc->country_code == 'FR') print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i></td></tr>\n";
-print "</table>";
+$tooltiphelp = '';
+if ($mysoc->country_code == 'FR') $tooltiphelp = '<i>'.$langs->trans("Example").': '.$langs->trans("VATIsUsedExampleFR")."</i>";
+print "<label for=\"use_vat\">".$form->textwithpicto($langs->trans("VATIsUsedDesc"), $tooltiphelp)."</label>";
 print "</td></tr>\n";
 
 
 print "<tr class=\"oddeven\"><td width=\"140\"><label><input type=\"radio\" name=\"optiontva\" id=\"no_vat\" value=\"0\"".(empty($conf->global->FACTURE_TVAOPTION) ? " checked" : "")."> ".$langs->trans("VATIsNotUsed")."</label></td>";
 print '<td colspan="2">';
-print "<table>";
-print "<tr><td><label for=\"no_vat\">".$langs->trans("VATIsNotUsedDesc")."</label></td></tr>";
-if ($mysoc->country_code == 'FR') print "<tr><td><i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i></td></tr>\n";
-print "</table>";
+$tooltiphelp = '';
+if ($mysoc->country_code == 'FR') $tooltiphelp = "<i>".$langs->trans("Example").': '.$langs->trans("VATIsNotUsedExampleFR")."</i>\n";
+print "<label for=\"no_vat\">".$form->textwithpicto($langs->trans("VATIsNotUsedDesc"), $tooltiphelp)."</label>";
 print "</td></tr>\n";
 
 print "</table>";
@@ -740,40 +726,35 @@ if ($mysoc->useLocalTax(1))
 	print '<br>';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td width="140">'.$langs->transcountry("LocalTax1Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
+	print '<td width="25%">'.$langs->transcountry("LocalTax1Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td class="right">&nbsp;</td>';
 	print "</tr>\n";
 
 	// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-	print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
+	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax1\" id=\"lt1\" value=\"localtax1on\"".(($conf->global->FACTURE_LOCAL_TAX1_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1on") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
-	print '<table class="nobordernopadding">';
-	print "<tr><td><label for=\"lt1\">".$langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
-	$example = $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
-	print ($example != "LocalTax1IsUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
+	print '<div class="nobordernopadding">';
+	$tooltiphelp = $langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code);
+	$tooltiphelp = ($tooltiphelp != "LocalTax1IsUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsUsedExample", $mysoc->country_code)."</i>\n" : "");
+	print "<label for=\"lt1\">".$form->textwithpicto($langs->transcountry("LocalTax1IsUsedDesc", $mysoc->country_code), $tooltiphelp)."</label>";
 	if (!isOnlyOneLocalTax(1))
 	{
-		print '<tr><td class="left"><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
+		print '<br><label for="lt1">'.$langs->trans("LTRate").'</label>: ';
 		$formcompany->select_localtax(1, $conf->global->MAIN_INFO_VALUE_LOCALTAX1, "lt1");
-	    print '</td></tr>';
 	}
 
 	$opcions = array($langs->trans("CalcLocaltax1").' '.$langs->trans("CalcLocaltax1Desc"), $langs->trans("CalcLocaltax2").' - '.$langs->trans("CalcLocaltax2Desc"), $langs->trans("CalcLocaltax3").' - '.$langs->trans("CalcLocaltax3Desc"));
 
-	print '<tr><td class="left"></label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
+	print '<br><label for="clt1">'.$langs->trans("CalcLocaltax").'</label>: ';
 	print $form->selectarray("clt1", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC1);
-	print '</td></tr>';
-	print "</table>";
+	print "</div>";
 	print "</td></tr>\n";
 
-
-	print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
+	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax1\" id=\"nolt1\" value=\"localtax1off\"".((empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || $conf->global->FACTURE_LOCAL_TAX1_OPTION == "localtax1off") ? " checked" : "")."> ".$langs->transcountry("LocalTax1IsNotUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
-	print "<table>";
-	print "<tr><td><label for=\"nolt1\">".$langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
-	$example = $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
-	print ($example != "LocalTax1IsNotUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
-	print "</table>";
+	$tooltiphelp = $langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code);
+	$tooltiphelp = ($tooltiphelp != "LocalTax1IsNotUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax1IsNotUsedExample", $mysoc->country_code)."</i>\n" : "");
+	print "<label for=\"nolt1\">".$form->textwithpicto($langs->transcountry("LocalTax1IsNotUsedDesc", $mysoc->country_code), $tooltiphelp)."</label>";
 	print "</td></tr>\n";
 	print "</table>";
 }
@@ -783,38 +764,34 @@ if ($mysoc->useLocalTax(2))
 	print '<br>';
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print '<td>'.$langs->transcountry("LocalTax2Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
+	print '<td width="25%">'.$langs->transcountry("LocalTax2Management", $mysoc->country_code).'</td><td>'.$langs->trans("Description").'</td>';
 	print '<td class="right">&nbsp;</td>';
 	print "</tr>\n";
 
-
 	// Note: When option is not set, it must not appears as set on on, because there is no default value for this option
-	print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
+	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax2\" id=\"lt2\" value=\"localtax2on\"".(($conf->global->FACTURE_LOCAL_TAX2_OPTION == '1' || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2on") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
-	print '<table class="nobordernopadding">';
-	print "<tr><td><label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label></td></tr>";
-	$example = $langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
-	print ($example != "LocalTax2IsUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
+	print '<div class="nobordernopadding">';
+	print "<label for=\"lt2\">".$langs->transcountry("LocalTax2IsUsedDesc", $mysoc->country_code)."</label>";
+	$tooltiphelp = $langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code);
+	$tooltiphelp = ($tooltiphelp != "LocalTax2IsUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsUsedExample", $mysoc->country_code)."</i>\n" : "");
 	if (!isOnlyOneLocalTax(2))
 	{
-	    print '<tr><td class="left"><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
+	    print '<br><label for="lt2">'.$langs->trans("LTRate").'</label>: ';
 	    $formcompany->select_localtax(2, $conf->global->MAIN_INFO_VALUE_LOCALTAX2, "lt2");
-		print '</td></tr>';
 	}
-	print '<tr><td class="left"><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
+	print '<br><label for="clt2">'.$langs->trans("CalcLocaltax").'</label>: ';
 	print $form->selectarray("clt2", $opcions, $conf->global->MAIN_INFO_LOCALTAX_CALC2);
-	print '</td></tr>';
-	print "</table>";
+	print "</div>";
 	print "</td></tr>\n";
 
-
-	print "<tr class=\"oddeven\"><td width=\"140\"><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
+	print "<tr class=\"oddeven\"><td><input type=\"radio\" name=\"optionlocaltax2\" id=\"nolt2\" value=\"localtax2off\"".((empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) || $conf->global->FACTURE_LOCAL_TAX2_OPTION == "localtax2off") ? " checked" : "")."> ".$langs->transcountry("LocalTax2IsNotUsed", $mysoc->country_code)."</td>";
 	print '<td colspan="2">';
-	print "<table>";
-	print "<tr><td><label for=\"nolt2\">".$langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code)."</label></td></tr>";
-	$example = $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
-	print ($example != "LocalTax2IsNotUsedExample" ? "<tr><td><i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code)."</i></td></tr>\n" : "");
-	print "</table>";
+	print "<div>";
+	$tooltiphelp = $langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code);
+	$tooltiphelp = ($tooltiphelp != "LocalTax2IsNotUsedExample" ? "<i>".$langs->trans("Example").': '.$langs->transcountry("LocalTax2IsNotUsedExample", $mysoc->country_code)."</i>\n" : "");
+	print "<label for=\"nolt2\">".$form->textwithpicto($langs->transcountry("LocalTax2IsNotUsedDesc", $mysoc->country_code), $tooltiphelp)."</label>";
+	print "</div>";
 	print "</td></tr>\n";
 	print "</table>";
 }
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index 29940f95d56..b3265479d38 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -45,8 +45,8 @@ $action=GETPOST('action', 'alpha');
 // Shipment note
 if (! empty($conf->expedition->enabled) && empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 {
-    // This option should always be set to on when module is on.
-    dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity);
+	// This option should always be set to on when module is on.
+	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity);
 }
 /*
 if ($action == 'activate_sending')
@@ -66,16 +66,16 @@ if ($action == 'disable_sending')
 // Delivery note
 if ($action == 'activate_delivery')
 {
-    dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity);    // We must also enable this
-    dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1", 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_SUBMODULE_EXPEDITION", "1", 'chaine', 0, '', $conf->entity);    // We must also enable this
+	dolibarr_set_const($db, "MAIN_SUBMODULE_LIVRAISON", "1", 'chaine', 0, '', $conf->entity);
 	header("Location: confexped.php");
 	exit;
 }
 elseif ($action == 'disable_delivery')
 {
 	dolibarr_del_const($db, "MAIN_SUBMODULE_LIVRAISON", $conf->entity);
-    header("Location: confexped.php");
-    exit;
+	header("Location: confexped.php");
+	exit;
 }
 
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 5b756c21017..1944f140ef3 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -207,7 +207,7 @@ llxHeader();
 
 print load_fiche_titre($langs->trans("DelaysOfToleranceBeforeWarning"), '', 'title_setup');
 
-print '<span class="opacitymedium">'.$langs->transnoentities("DelaysOfToleranceDesc", img_warning());
+print '<span class="opacitymedium">'.$langs->transnoentities("DelaysOfToleranceDesc", img_warning('default', '', 'pictowarning nopaddingleft'));
 print " ".$langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php')."</span><br>\n";
 print "<br>\n";
 
diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index ecba02c712c..8d1122417b5 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -40,19 +40,19 @@ $id_image   = GETPOST('id_image', 'int');
 $quality    = GETPOST('quality', 'alpha');
 
 try {
-    $url = $conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'/api/images/products/'.$id_product.'/'.$id_image.'/'.$quality;
-    $api = new PrestaShopWebservice(
-        $conf->global->MAIN_MODULE_DOLISTORE_API_SRV,
-        $conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $dolistore->debug_api
-    );
-    //echo $url;
-    $request = $api->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
-    header('Content-type:image');
-    print $request['response'];
+	$url = $conf->global->MAIN_MODULE_DOLISTORE_API_SRV.'/api/images/products/'.$id_product.'/'.$id_image.'/'.$quality;
+	$api = new PrestaShopWebservice(
+		$conf->global->MAIN_MODULE_DOLISTORE_API_SRV,
+		$conf->global->MAIN_MODULE_DOLISTORE_API_KEY, $dolistore->debug_api
+	);
+	//echo $url;
+	$request = $api->executeRequest($url, array(CURLOPT_CUSTOMREQUEST => 'GET'));
+	header('Content-type:image');
+	print $request['response'];
 } catch (PrestaShopWebserviceException $e) {
-    // Here we are dealing with errors
-    $trace = $e->getTrace();
-    if ($trace[0]['args'][0] == 404) die('Bad ID');
-    elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
-    else die('Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV);
+	// Here we are dealing with errors
+	$trace = $e->getTrace();
+	if ($trace[0]['args'][0] == 404) die('Bad ID');
+	elseif ($trace[0]['args'][0] == 401) die('Bad auth key');
+	else die('Can not access to '.$conf->global->MAIN_MODULE_DOLISTORE_API_SRV);
 }
diff --git a/htdocs/admin/ecm.php b/htdocs/admin/ecm.php
index 2fcf3fe6422..66fa695c5b9 100644
--- a/htdocs/admin/ecm.php
+++ b/htdocs/admin/ecm.php
@@ -36,30 +36,30 @@ if (! $user->admin) accessforbidden();
  */
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code=$reg[1];
-    if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	$code=$reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
 
 if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code=$reg[1];
-    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
 
 
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index a34bd841c81..69ad145e7df 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -86,9 +86,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>";
 }
 
 
@@ -101,9 +101,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -113,10 +113,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 276a50bc440..61dcf3dcf66 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -80,9 +80,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>";
 }
 
 
@@ -95,9 +95,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -107,10 +107,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index cab7bfaecf0..ad077361fe8 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -185,7 +185,7 @@ else
 	print '<br>'."\n";
 
 	print '<form name="formtest" method="POST" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-    print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+    print '<input type="hidden" name="token" value="' . newToken() . '">';
 
 	// Skins
     show_skin(null, 1);
diff --git a/htdocs/admin/ldap_contacts.php b/htdocs/admin/ldap_contacts.php
index 4a6a21197a8..d2984cab6bf 100644
--- a/htdocs/admin/ldap_contacts.php
+++ b/htdocs/admin/ldap_contacts.php
@@ -68,22 +68,22 @@ if ($action == 'setvalue' && $user->admin)
 	if (! dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_TOWN', GETPOST("fieldtown"), 'chaine', 0, '', $conf->entity)) $error++;
 	if (! dolibarr_set_const($db, 'LDAP_CONTACT_FIELD_COUNTRY', GETPOST("fieldcountry"), 'chaine', 0, '', $conf->entity)) $error++;
 
-    // This one must be after the others
-    $valkey='';
-    $key=GETPOST("key");
-    if ($key) $valkey=$conf->global->$key;
-    if (! dolibarr_set_const($db, 'LDAP_KEY_CONTACTS', $valkey, 'chaine', 0, '', $conf->entity)) $error++;
+	// This one must be after the others
+	$valkey='';
+	$key=GETPOST("key");
+	if ($key) $valkey=$conf->global->$key;
+	if (! dolibarr_set_const($db, 'LDAP_KEY_CONTACTS', $valkey, 'chaine', 0, '', $conf->entity)) $error++;
 
-    if (! $error)
-    {
-    	$db->commit();
-    	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-    	$db->rollback();
-    	dol_print_error($db);
-    }
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		$db->rollback();
+		dol_print_error($db);
+	}
 }
 
 
diff --git a/htdocs/admin/limits.php b/htdocs/admin/limits.php
index 8bc356e18d9..6f52d6dfd12 100644
--- a/htdocs/admin/limits.php
+++ b/htdocs/admin/limits.php
@@ -207,29 +207,29 @@ if (empty($mysoc->country_code))
 else
 {
 	// Show examples
-	print '<b>'.$langs->trans("ExamplesWithCurrentSetup").":</b><br>\n";
+	print load_fiche_titre($langs->trans("ExamplesWithCurrentSetup"), '', '');
 
 	// Always show vat rates with vat 0
 	$s=2/7;$qty=1;$vat=0;
 	$tmparray=calcul_price_total(1, $qty*price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
-	print $langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
+	print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	print " x ".$langs->trans("Quantity").": ".$qty;
 	print " - ".$langs->trans("VAT").": ".$vat.'%';
-	print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
 	$s=10/3;$qty=1;$vat=0;
 	$tmparray=calcul_price_total(1, $qty*price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
-	print $langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
+	print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	print " x ".$langs->trans("Quantity").": ".$qty;
 	print " - ".$langs->trans("VAT").": ".$vat.'%';
-	print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
 	$s=10/3;$qty=2;$vat=0;
 	$tmparray=calcul_price_total(1, $qty*price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
-	print $langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
+	print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	print " x ".$langs->trans("Quantity").": ".$qty;
 	print " - ".$langs->trans("VAT").": ".$vat.'%';
-	print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
 	// Add vat rates examples specific to country
 	$vat_rates=array();
@@ -261,10 +261,10 @@ else
 	        {
 	            $s=10/3;
 	            $tmparray=calcul_price_total(1, $qty*price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
-	            print $langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
+	            print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	            print " x ".$langs->trans("Quantity").": ".$qty;
 	            print " - ".$langs->trans("VAT").": ".$vat.'%';
-	            print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	            print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 	        }
 	    }
 	}
@@ -276,17 +276,17 @@ else
 
 	    $s=10/3;$qty=1;$vat=10;
 	    $tmparray=calcul_price_total(1, $qty*price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
-	    print $langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
+	    print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	    print " x ".$langs->trans("Quantity").": ".$qty;
 	    print " - ".$langs->trans("VAT").": ".$vat.'%';
-	    print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	    print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 
 	    $s=10/3;$qty=2;$vat=10;
 	    $tmparray=calcul_price_total(1, $qty*price2num($s, 'MU'), 0, $vat, 0, 0, 0, 'HT', 0, 0, $mysoc);
-	    print $langs->trans("UnitPriceOfProduct").": ".price2num($s, 'MU');
+	    print '<span class="opacitymedium">'.$langs->trans("UnitPriceOfProduct").":</span> ".price2num($s, 'MU');
 	    print " x ".$langs->trans("Quantity").": ".$qty;
 	    print " - ".$langs->trans("VAT").": ".$vat.'%';
-	    print " &nbsp; -> &nbsp; ".$langs->trans("TotalPriceAfterRounding").": ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
+	    print ' &nbsp; -> &nbsp; <span class="opacitymedium">'.$langs->trans("TotalPriceAfterRounding").":</span> ".$tmparray[0].' / '.$tmparray[1].' / '.$tmparray[2]."<br>\n";
 	}
 
 	// Important: can debug rounding, to simulate the rounded total
diff --git a/htdocs/admin/livraison_extrafields.php b/htdocs/admin/livraison_extrafields.php
index b78e6f1730e..814a865216d 100644
--- a/htdocs/admin/livraison_extrafields.php
+++ b/htdocs/admin/livraison_extrafields.php
@@ -86,9 +86,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>";
 }
 
 
@@ -101,9 +101,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -113,10 +113,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 4a37c761628..7598d2d8588 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -48,7 +48,7 @@ if ($action == 'setvalue')
 	$mailerror = GETPOST('MAILING_EMAIL_ERRORSTO', 'alpha');
 	$checkread = GETPOST('value', 'alpha');
 	$checkread_key = GETPOST('MAILING_EMAIL_UNSUBSCRIBE_KEY', 'alpha');
-    $mailingdelay = GETPOST('MAILING_DELAY', 'int');
+	$mailingdelay = GETPOST('MAILING_DELAY', 'int');
 
 	$res=dolibarr_set_const($db, "MAILING_EMAIL_FROM", $mailfrom, 'chaine', 0, '', $conf->entity);
 	if (! $res > 0) $error++;
@@ -61,16 +61,16 @@ if ($action == 'setvalue')
 	$res=dolibarr_set_const($db, "MAILING_EMAIL_UNSUBSCRIBE_KEY", $checkread_key, 'chaine', 0, '', $conf->entity);
 	if (! $res > 0) $error++;
 
-    if (! $error)
-    {
-    	$db->commit();
-    	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-    	$db->rollback();
-    	setEventMessages($langs->trans("Error"), null, 'errors');
-    }
+	if (! $error)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
 }
 
 
diff --git a/htdocs/admin/menus.php b/htdocs/admin/menus.php
index 32cd7c35829..ce0136642e2 100644
--- a/htdocs/admin/menus.php
+++ b/htdocs/admin/menus.php
@@ -41,8 +41,8 @@ $dirsmartphone = array();
 $dirmenus=array_merge(array("/core/menus/"), (array) $conf->modules_parts['menus']);
 foreach($dirmenus as $dirmenu)
 {
-    $dirstandard[]=$dirmenu.'standard';
-    $dirsmartphone[]=$dirmenu.'smartphone';
+	$dirstandard[]=$dirmenu.'standard';
+	$dirsmartphone[]=$dirmenu.'smartphone';
 }
 
 $error=0;
@@ -85,8 +85,8 @@ if ($action == 'update' && ! $cancel)
 		foreach($dirmenus as $dirmenu)
 		{
 			$file='init_menu_'.$key.'.sql';
-		    $fullpath=dol_buildpath($dirmenu.$file);
-		    //print 'action='.$action.' Search menu into fullpath='.$fullpath.'<br>';exit;
+			$fullpath=dol_buildpath($dirmenu.$file);
+			//print 'action='.$action.' Search menu into fullpath='.$fullpath.'<br>';exit;
 
 			if (file_exists($fullpath))
 			{
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 531e53ac459..08ddbd4ad6a 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -290,7 +290,7 @@ $text='';
 
 if ($mode == 'desc')
 {
-    if ($moduledesc) $text.=$moduledesc.'<br><br>';
+    if ($moduledesc) $text .= '<br>'.$moduledesc.'<br><br><br>';
 
     $text.='<strong>'.$langs->trans("Version").':</strong> '.$version;
 
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 72eb8240c10..4056bca0ee3 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -552,7 +552,7 @@ if ($mode == 'common')
     if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 
     // Show list of modules
-
+    //$conf->global->MAIN_USE_KANBAN_FOR_MODULES=1;
     $oldfamily = '';
 
     foreach ($orders as $key => $value)
@@ -637,8 +637,12 @@ if ($mode == 'common')
             $familytext = empty($familyinfo[$familykey]['label']) ? $familykey : $familyinfo[$familykey]['label'];
             print load_fiche_titre($familytext, '', '');
 
-            print '<div class="div-table-responsive">';
-            print '<table class="tagtable liste" summary="list_of_modules">'."\n";
+            if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) {
+            	print '<div class="box-flex-container">';
+            } else {
+	            print '<div class="div-table-responsive">';
+    	        print '<table class="tagtable liste" summary="list_of_modules">'."\n";
+			}
 
             $atleastoneforfamily = 0;
         }
@@ -651,9 +655,6 @@ if ($mode == 'common')
         	$oldfamily = $familykey;
         }
 
-
-
-
         // Version (with picto warning or not)
         $version = $objMod->getVersion(0);
         $versiontrans = '';
@@ -669,212 +670,221 @@ if ($mode == 'common')
             $imginfo = "info_black";
         }
 
-        print '<tr class="oddeven">'."\n";
-        if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) print '<td width="20px">'.++$linenum.'</td>';
+        if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) {
+        	// Output Kanban
+        	print $objMod->getKanbanView();
+        } else {
+	        print '<tr class="oddeven">'."\n";
+	        if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) print '<td width="20px">'.++$linenum.'</td>';
 
-        // Picto + Name of module
-        print '  <td width="200px">';
-        $alttext = '';
-        //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
-        //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
-        if (!empty($objMod->picto))
-        {
-        	if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule"', 1);
-        	else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule"');
-        }
-        else
-        {
-        	print img_object($alttext, 'generic', 'class="valignmiddle"');
-        }
-        print ' <span class="valignmiddle">'.$objMod->getName().'</span>';
-        print "</td>\n";
-
-        // Desc
-        print '<td class="valignmiddle tdoverflowmax300">';
-        print nl2br($objMod->getDesc());
-        print "</td>\n";
-
-        // Help
-        print '<td class="center nowrap" style="width: 82px;">';
-        //print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20', 0, 2, 1);
-        print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-        print '</td>';
-
-        // Version
-        print '<td class="center nowrap" width="120px">';
-        print $versiontrans;
-        if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)) {
-            require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-            if (!empty($objMod->url_last_version)) {
-                $newversion = getURLContent($objMod->url_last_version);
-                if (isset($newversion['content'])) {
-                    if (version_compare($newversion['content'], $versiontrans) > 0) {
-                        print "&nbsp;<span class='butAction' title='".$langs->trans('LastStableVersion')."'>".$newversion['content']."</span>";
-                    }
-                }
-            }
-        }
-        print "</td>\n";
-
-        // Activate/Disable and Setup (2 columns)
-        if (!empty($conf->global->$const_name))	// If module is already activated
-        {
-        	$disableSetup = 0;
-
-        	// Link enable/disabme
-        	print '<td class="center valignmiddle" width="60px">';
-        	if (!empty($arrayofwarnings[$modName]))
+	        // Picto + Name of module
+	        print '  <td width="200px">';
+	        $alttext = '';
+	        //if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
+	        //if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
+	        if (!empty($objMod->picto))
 	        {
-                print '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
+	        	if (preg_match('/^\//i', $objMod->picto)) print img_picto($alttext, $objMod->picto, 'class="valignmiddle pictomodule"', 1);
+	        	else print img_object($alttext, $objMod->picto, 'class="valignmiddle pictomodule"');
 	        }
-	        if (!empty($objMod->disabled))
-        	{
-        		print $langs->trans("Disabled");
-        	}
-        	elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
-        	{
-        		if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) print $langs->trans("Used");
-        		else {
-        			print img_picto($langs->trans("Required"), 'switch_on', '', false, 0, 0, '', 'opacitymedium');
-        			//print $langs->trans("Required");
-        		}
-        		if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
-        	}
-        	else
-        	{
-        		if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
-        			print '<a class="reposition" 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.'">';
-        			print img_picto($langs->trans("Activated"), 'switch_on');
-        			print '</a>';
-        		}
-        		else {
-        			print '<a class="reposition" 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.'">';
-        			print img_picto($langs->trans("Activated"), 'switch_on');
-        			print '</a>';
-        		}
-        	}
-        	print '</td>'."\n";
+	        else
+	        {
+	        	print img_object($alttext, 'generic', 'class="valignmiddle"');
+	        }
+	        print ' <span class="valignmiddle">'.$objMod->getName().'</span>';
+	        print "</td>\n";
 
-        	// Link config
-        	if (!empty($objMod->config_page_url) && !$disableSetup)
-        	{
-        		$backtourlparam = '';
-        		if ($search_keyword != '') $backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
-        		if ($search_nature > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
-        		if ($search_version > -1)  $backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
-        		if ($search_status > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
-        		$backtourl = $_SERVER["PHP_SELF"].$backtourlparam;
+	        // Desc
+	        print '<td class="valignmiddle tdoverflowmax300">';
+	        print nl2br($objMod->getDesc());
+	        print "</td>\n";
 
-        		if (is_array($objMod->config_page_url))
-        		{
-        			print '<td class="tdsetuppicto right" width="60px">';
-        			$i = 0;
-        			foreach ($objMod->config_page_url as $page)
-        			{
-        				$urlpage = $page;
-        				if ($i++)
-        				{
-        					print '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
-        					//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
-        				}
-        				else
-        				{
-        					if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
-        					{
-        						$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
-        						print '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
-        					}
-        					else
-        					{
-        						$urltouse = $urlpage;
-        						print '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
-        					}
-        				}
-        			}
-        			print "</td>\n";
-        		}
-        		elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
-        		{
-        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a></td>';
-        		}
-        		else
-        		{
-        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a></td>';
-        		}
-        	}
-        	else
-        	{
-        		print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"').'</td>';
-        	}
-        }
-        else	// Module not yet activated
-		{
-		    // Link enable/disable
-        	print '<td class="center valignmiddle" width="60px">';
-		    if (!empty($objMod->always_enabled))
-        	{
-        		// Should never happened
-        	}
-        	elseif (!empty($objMod->disabled))
-        	{
-        		print $langs->trans("Disabled");
-        	}
-        	else
-        	{
-	        	// Module qualified for activation
-        	    $warningmessage = '';
+	        // Help
+	        print '<td class="center nowrap" style="width: 82px;">';
+	        //print $form->textwithpicto('', $text, 1, $imginfo, 'minheight20', 0, 2, 1);
+	        print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$objMod->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+	        print '</td>';
+
+	        // Version
+	        print '<td class="center nowrap" width="120px">';
+	        print $versiontrans;
+	        if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)) {
+	            require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+	            if (!empty($objMod->url_last_version)) {
+	                $newversion = getURLContent($objMod->url_last_version);
+	                if (isset($newversion['content'])) {
+	                    if (version_compare($newversion['content'], $versiontrans) > 0) {
+	                        print "&nbsp;<span class='butAction' title='".$langs->trans('LastStableVersion')."'>".$newversion['content']."</span>";
+	                    }
+	                }
+	            }
+	        }
+	        print "</td>\n";
+
+	        // Activate/Disable and Setup (2 columns)
+	        if (!empty($conf->global->$const_name))	// If module is already activated
+	        {
+	        	$disableSetup = 0;
+
+	        	// Link enable/disabme
+	        	print '<td class="center valignmiddle" width="60px">';
 	        	if (!empty($arrayofwarnings[$modName]))
+		        {
+	                print '<!-- This module has a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
+		        }
+		        if (!empty($objMod->disabled))
 	        	{
-                    print '<!-- This module is a core module and it may have a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
-	        	    foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage)
-   	        	    {
-   	        	    	if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
-   	        	    	{
-	        	        	$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);
-   	        	    	}
-   	        	    }
+	        		print $langs->trans("Disabled");
 	        	}
-        		if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext))
+	        	elseif (!empty($objMod->always_enabled) || ((!empty($conf->multicompany->enabled) && $objMod->core_enabled) && ($user->entity || $conf->entity != 1)))
 	        	{
-	        	    print '<!-- This module is an external module and it may have a warning to show (note: your country is '.$mysoc->country_code.') -->'."\n";
-	        	    foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
-	        	    {
-                        $keymodulelowercase = strtolower(preg_replace('/^mod/', '', $keymodule));
-                        if (in_array($keymodulelowercase, $conf->modules))    // If module that request warning is on
-	        	        {
-        	        	    foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
-        	        	    {
-        	        	    	if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
-        	        	        {
-        	        	            $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
-        	        	            $warningmessage .= ($warningmessage ? "\n" : "").($warningmessage ? "\n" : "").$langs->trans("Module").' : '.$objMod->getName();
-        	        	            if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
-        	        	            if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
-        	        	        }
-        	        	    }
-	        	        }
-	        	    }
+	        		if (method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) print $langs->trans("Used");
+	        		else {
+	        			print img_picto($langs->trans("Required"), 'switch_on', '', false, 0, 0, '', 'opacitymedium');
+	        			//print $langs->trans("Required");
+	        		}
+	        		if (!empty($conf->multicompany->enabled) && $user->entity) $disableSetup++;
 	        	}
-        	    print '<!-- Message to show: '.$warningmessage.' -->'."\n";
-	        	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';
-	        	if ($warningmessage) print ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
-	        	print '>';
-	        	print img_picto($langs->trans("Disabled"), 'switch_off');
-	        	print "</a>\n";
-        	}
-        	print "</td>\n";
+	        	else
+	        	{
+	        		if (!empty($objMod->warnings_unactivation[$mysoc->country_code]) && method_exists($objMod, 'alreadyUsed') && $objMod->alreadyUsed()) {
+	        			print '<a class="reposition" 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.'">';
+	        			print img_picto($langs->trans("Activated"), 'switch_on');
+	        			print '</a>';
+	        		}
+	        		else {
+	        			print '<a class="reposition" 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.'">';
+	        			print img_picto($langs->trans("Activated"), 'switch_on');
+	        			print '</a>';
+	        		}
+	        	}
+	        	print '</td>'."\n";
 
-        	// Link config
-        	print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"').'</td>';
+	        	// Link config
+	        	if (!empty($objMod->config_page_url) && !$disableSetup)
+	        	{
+	        		$backtourlparam = '';
+	        		if ($search_keyword != '') $backtourlparam .= ($backtourlparam ? '&' : '?').'search_keyword='.$search_keyword; // No urlencode here, done later
+	        		if ($search_nature > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_nature='.$search_nature;
+	        		if ($search_version > -1)  $backtourlparam .= ($backtourlparam ? '&' : '?').'search_version='.$search_version;
+	        		if ($search_status > -1)   $backtourlparam .= ($backtourlparam ? '&' : '?').'search_status='.$search_status;
+	        		$backtourl = $_SERVER["PHP_SELF"].$backtourlparam;
+
+	        		if (is_array($objMod->config_page_url))
+	        		{
+	        			print '<td class="tdsetuppicto right" width="60px">';
+	        			$i = 0;
+	        			foreach ($objMod->config_page_url as $page)
+	        			{
+	        				$urlpage = $page;
+	        				if ($i++)
+	        				{
+	        					print '<a href="'.$urlpage.'" title="'.$langs->trans($page).'">'.img_picto(ucfirst($page), "setup").'</a>';
+	        					//    print '<a href="'.$page.'">'.ucfirst($page).'</a>&nbsp;';
+	        				}
+	        				else
+	        				{
+	        					if (preg_match('/^([^@]+)@([^@]+)$/i', $urlpage, $regs))
+	        					{
+	        						$urltouse = dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1);
+	        						print '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
+	        					}
+	        					else
+	        					{
+	        						$urltouse = $urlpage;
+	        						print '<a href="'.$urltouse.(preg_match('/\?/', $urltouse) ? '&' : '?').'save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a>';
+	        					}
+	        				}
+	        			}
+	        			print "</td>\n";
+	        		}
+	        		elseif (preg_match('/^([^@]+)@([^@]+)$/i', $objMod->config_page_url, $regs))
+	        		{
+	        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.dol_buildpath('/'.$regs[2].'/admin/'.$regs[1], 1).'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a></td>';
+	        		}
+	        		else
+	        		{
+	        			print '<td class="tdsetuppicto right valignmiddle" width="60px"><a href="'.$objMod->config_page_url.'?save_lastsearch_values=1&backtopage='.urlencode($backtourl).'" title="'.$langs->trans("Setup").'">'.img_picto($langs->trans("Setup"), "setup", 'style="padding-right: 6px"').'</a></td>';
+	        		}
+	        	}
+	        	else
+	        	{
+	        		print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"').'</td>';
+	        	}
+	        }
+	        else	// Module not yet activated
+			{
+			    // Link enable/disable
+	        	print '<td class="center valignmiddle" width="60px">';
+			    if (!empty($objMod->always_enabled))
+	        	{
+	        		// Should never happened
+	        	}
+	        	elseif (!empty($objMod->disabled))
+	        	{
+	        		print $langs->trans("Disabled");
+	        	}
+	        	else
+	        	{
+		        	// Module qualified for activation
+	        	    $warningmessage = '';
+		        	if (!empty($arrayofwarnings[$modName]))
+		        	{
+	                    print '<!-- This module is a core module and it may have a warning to show when we activate it (note: your country is '.$mysoc->country_code.') -->'."\n";
+		        	    foreach ($arrayofwarnings[$modName] as $keycountry => $cursorwarningmessage)
+	   	        	    {
+	   	        	    	if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
+	   	        	    	{
+		        	        	$warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code);
+	   	        	    	}
+	   	        	    }
+		        	}
+	        		if ($objMod->isCoreOrExternalModule() == 'external' && !empty($arrayofwarningsext))
+		        	{
+		        	    print '<!-- This module is an external module and it may have a warning to show (note: your country is '.$mysoc->country_code.') -->'."\n";
+		        	    foreach ($arrayofwarningsext as $keymodule => $arrayofwarningsextbycountry)
+		        	    {
+	                        $keymodulelowercase = strtolower(preg_replace('/^mod/', '', $keymodule));
+	                        if (in_array($keymodulelowercase, $conf->modules))    // If module that request warning is on
+		        	        {
+	        	        	    foreach ($arrayofwarningsextbycountry as $keycountry => $cursorwarningmessage)
+	        	        	    {
+	        	        	    	if (preg_match('/^always/', $keycountry) || ($mysoc->country_code && preg_match('/^'.$mysoc->country_code.'/', $keycountry)))
+	        	        	        {
+	        	        	            $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans($cursorwarningmessage, $objMod->getName(), $mysoc->country_code, $modules[$keymodule]->getName());
+	        	        	            $warningmessage .= ($warningmessage ? "\n" : "").($warningmessage ? "\n" : "").$langs->trans("Module").' : '.$objMod->getName();
+	        	        	            if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("Publisher").' : '.$objMod->editor_name;
+	        	        	            if (!empty($objMod->editor_name)) $warningmessage .= ($warningmessage ? "\n" : "").$langs->trans("ModuleTriggeringThisWarning").' : '.$modules[$keymodule]->getName();
+	        	        	        }
+	        	        	    }
+		        	        }
+		        	    }
+		        	}
+	        	    print '<!-- Message to show: '.$warningmessage.' -->'."\n";
+		        	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$objMod->numero.'&amp;module_position='.$module_position.'&amp;action=set&amp;value='.$modName.'&amp;mode='.$mode.$param.'"';
+		        	if ($warningmessage) print ' onclick="return confirm(\''.dol_escape_js($warningmessage).'\');"';
+		        	print '>';
+		        	print img_picto($langs->trans("Disabled"), 'switch_off');
+		        	print "</a>\n";
+	        	}
+	        	print "</td>\n";
+
+	        	// Link config
+	        	print '<td class="tdsetuppicto right valignmiddle" width="60px">'.img_picto($langs->trans("NothingToSetup"), "setup", 'class="opacitytransp" style="padding-right: 6px"').'</td>';
+	        }
+
+	        print "</tr>\n";
         }
-
-        print "</tr>\n";
     }
 
     if ($oldfamily)
     {
-        print "</table>\n";
-        print '</div>';
+    	if (! empty($conf->global->MAIN_USE_KANBAN_FOR_MODULES)) {
+    		print '</div>';
+    	} else {
+        	print "</table>\n";
+        	print '</div>';
+    	}
     }
 
     dol_fiche_end();
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index 0c6d3e219b8..a2db56549e3 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -148,7 +148,10 @@ elseif ($action == 'setapilayer')
     }
     else
     {
-        MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
+        $result = MultiCurrency::syncRates($conf->global->MULTICURRENCY_APP_ID);
+        if ($result > 0) {
+        	setEventMessages($langs->trans("CurrencyRateSyncSucceed"), null, "mesgs");
+        }
     }
 }
 
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index b3e6ec312ae..12231079ae0 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -46,15 +46,15 @@ $type = 'paymentorder';
 
 if ($action == "set")
 {
-    $db->begin();
+	$db->begin();
 
-    $id=GETPOST('PRELEVEMENT_ID_BANKACCOUNT', 'int');
-    $account = new Account($db);
-    if($account->fetch($id)>0)
-    {
-        $res = dolibarr_set_const($db, "PRELEVEMENT_ID_BANKACCOUNT", $id, 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
-        /*
+	$id=GETPOST('PRELEVEMENT_ID_BANKACCOUNT', 'int');
+	$account = new Account($db);
+	if($account->fetch($id)>0)
+	{
+		$res = dolibarr_set_const($db, "PRELEVEMENT_ID_BANKACCOUNT", $id, 'chaine', 0, '', $conf->entity);
+		if (! $res > 0) $error++;
+		/*
         $res = dolibarr_set_const($db, "PRELEVEMENT_CODE_BANQUE", $account->code_banque,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         $res = dolibarr_set_const($db, "PRELEVEMENT_CODE_GUICHET", $account->code_guichet,'chaine',0,'',$conf->entity);
@@ -70,33 +70,33 @@ if ($action == "set")
         $res = dolibarr_set_const($db, "PRELEVEMENT_RAISON_SOCIALE", $account->proprio,'chaine',0,'',$conf->entity);
         if (! $res > 0) $error++;
         */
-    }
-    else $error++;
+	}
+	else $error++;
 
-    $res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
-    if (! $res > 0) $error++;
+	$res = dolibarr_set_const($db, "PRELEVEMENT_ICS", GETPOST("PRELEVEMENT_ICS"), 'chaine', 0, '', $conf->entity);
+	if (! $res > 0) $error++;
 
-    if (GETPOST("PRELEVEMENT_USER") > 0)
-    {
-        $res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
-    }
-    if (GETPOST("PRELEVEMENT_END_TO_END") || GETPOST("PRELEVEMENT_END_TO_END")=="")
-    {
-        $res = dolibarr_set_const($db, "PRELEVEMENT_END_TO_END", GETPOST("PRELEVEMENT_END_TO_END"), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
-    }
-    if (GETPOST("PRELEVEMENT_USTRD") || GETPOST("PRELEVEMENT_USTRD")=="")
-    {
-        $res = dolibarr_set_const($db, "PRELEVEMENT_USTRD", GETPOST("PRELEVEMENT_USTRD"), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
-    }
+	if (GETPOST("PRELEVEMENT_USER") > 0)
+	{
+		$res = dolibarr_set_const($db, "PRELEVEMENT_USER", GETPOST("PRELEVEMENT_USER"), 'chaine', 0, '', $conf->entity);
+		if (! $res > 0) $error++;
+	}
+	if (GETPOST("PRELEVEMENT_END_TO_END") || GETPOST("PRELEVEMENT_END_TO_END")=="")
+	{
+		$res = dolibarr_set_const($db, "PRELEVEMENT_END_TO_END", GETPOST("PRELEVEMENT_END_TO_END"), 'chaine', 0, '', $conf->entity);
+		if (! $res > 0) $error++;
+	}
+	if (GETPOST("PRELEVEMENT_USTRD") || GETPOST("PRELEVEMENT_USTRD")=="")
+	{
+		$res = dolibarr_set_const($db, "PRELEVEMENT_USTRD", GETPOST("PRELEVEMENT_USTRD"), 'chaine', 0, '', $conf->entity);
+		if (! $res > 0) $error++;
+	}
 
-    if (GETPOST("PRELEVEMENT_ADDDAYS") || GETPOST("PRELEVEMENT_ADDDAYS")=="")
-    {
-        $res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
-        if (! $res > 0) $error++;
-    } elseif (! $error)
+	if (GETPOST("PRELEVEMENT_ADDDAYS") || GETPOST("PRELEVEMENT_ADDDAYS")=="")
+	{
+		$res = dolibarr_set_const($db, "PRELEVEMENT_ADDDAYS", GETPOST("PRELEVEMENT_ADDDAYS"), 'chaine', 0, '', $conf->entity);
+		if (! $res > 0) $error++;
+	} elseif (! $error)
 	{
 		$db->commit();
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -110,20 +110,20 @@ if ($action == "set")
 
 if ($action == "addnotif")
 {
-    $bon = new BonPrelevement($db);
-    $bon->AddNotification($db, GETPOST('user', 'int'), $action);
+	$bon = new BonPrelevement($db);
+	$bon->AddNotification($db, GETPOST('user', 'int'), $action);
 
-    header("Location: prelevement.php");
-    exit;
+	header("Location: prelevement.php");
+	exit;
 }
 
 if ($action == "deletenotif")
 {
-    $bon = new BonPrelevement($db);
-    $bon->DeleteNotificationById(GETPOST('notif', 'int'));
+	$bon = new BonPrelevement($db);
+	$bon->DeleteNotificationById(GETPOST('notif', 'int'));
 
-    header("Location: prelevement.php");
-    exit;
+	header("Location: prelevement.php");
+	exit;
 }
 
 /*
diff --git a/htdocs/admin/proxy.php b/htdocs/admin/proxy.php
index c00bef75697..9011c6b4e67 100644
--- a/htdocs/admin/proxy.php
+++ b/htdocs/admin/proxy.php
@@ -40,34 +40,34 @@ $upload_dir=$conf->admin->dir_temp;
 
 if (GETPOST('action', 'aZ09') == 'set_proxy')
 {
-    if (GETPOST("MAIN_USE_CONNECT_TIMEOUT") && ! is_numeric(GETPOST("MAIN_USE_CONNECT_TIMEOUT")))
-    {
-        setEventMessages($langs->trans("ErrorValueMustBeInteger"), null, 'errors');
-        $error++;
-    }
-    if (GETPOST("MAIN_USE_RESPONSE_TIMEOUT") && ! is_numeric(GETPOST("MAIN_USE_RESPONSE_TIMEOUT")))
-    {
-        setEventMessages($langs->trans("ErrorValueMustBeInteger"), null, 'errors');
-        $error++;
-    }
+	if (GETPOST("MAIN_USE_CONNECT_TIMEOUT") && ! is_numeric(GETPOST("MAIN_USE_CONNECT_TIMEOUT")))
+	{
+		setEventMessages($langs->trans("ErrorValueMustBeInteger"), null, 'errors');
+		$error++;
+	}
+	if (GETPOST("MAIN_USE_RESPONSE_TIMEOUT") && ! is_numeric(GETPOST("MAIN_USE_RESPONSE_TIMEOUT")))
+	{
+		setEventMessages($langs->trans("ErrorValueMustBeInteger"), null, 'errors');
+		$error++;
+	}
 
-    if (! $error)
-    {
-        $result=0;
-        $result+=dolibarr_set_const($db, 'MAIN_USE_CONNECT_TIMEOUT', GETPOST("MAIN_USE_CONNECT_TIMEOUT"), 'chaine', 0, '', $conf->entity);
-        $result+=dolibarr_set_const($db, 'MAIN_USE_RESPONSE_TIMEOUT', GETPOST("MAIN_USE_RESPONSE_TIMEOUT"), 'chaine', 0, '', $conf->entity);
-        $result+=dolibarr_set_const($db, 'MAIN_PROXY_USE', GETPOST("MAIN_PROXY_USE"), 'chaine', 0, '', $conf->entity);
-        $result+=dolibarr_set_const($db, 'MAIN_PROXY_HOST', GETPOST("MAIN_PROXY_HOST"), 'chaine', 0, '', $conf->entity);
-        $result+=dolibarr_set_const($db, 'MAIN_PROXY_PORT', GETPOST("MAIN_PROXY_PORT"), 'chaine', 0, '', $conf->entity);
-        $result+=dolibarr_set_const($db, 'MAIN_PROXY_USER', GETPOST("MAIN_PROXY_USER"), 'chaine', 0, '', $conf->entity);
-        $result+=dolibarr_set_const($db, 'MAIN_PROXY_PASS', GETPOST("MAIN_PROXY_PASS"), 'chaine', 0, '', $conf->entity);
-        if ($result < 5) dol_print_error($db);
-    }
+	if (! $error)
+	{
+		$result=0;
+		$result+=dolibarr_set_const($db, 'MAIN_USE_CONNECT_TIMEOUT', GETPOST("MAIN_USE_CONNECT_TIMEOUT"), 'chaine', 0, '', $conf->entity);
+		$result+=dolibarr_set_const($db, 'MAIN_USE_RESPONSE_TIMEOUT', GETPOST("MAIN_USE_RESPONSE_TIMEOUT"), 'chaine', 0, '', $conf->entity);
+		$result+=dolibarr_set_const($db, 'MAIN_PROXY_USE', GETPOST("MAIN_PROXY_USE"), 'chaine', 0, '', $conf->entity);
+		$result+=dolibarr_set_const($db, 'MAIN_PROXY_HOST', GETPOST("MAIN_PROXY_HOST"), 'chaine', 0, '', $conf->entity);
+		$result+=dolibarr_set_const($db, 'MAIN_PROXY_PORT', GETPOST("MAIN_PROXY_PORT"), 'chaine', 0, '', $conf->entity);
+		$result+=dolibarr_set_const($db, 'MAIN_PROXY_USER', GETPOST("MAIN_PROXY_USER"), 'chaine', 0, '', $conf->entity);
+		$result+=dolibarr_set_const($db, 'MAIN_PROXY_PASS', GETPOST("MAIN_PROXY_PASS"), 'chaine', 0, '', $conf->entity);
+		if ($result < 5) dol_print_error($db);
+	}
 
-    if (! $error)
-    {
-        setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-    }
+	if (! $error)
+	{
+		setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+	}
 }
 
 
@@ -99,8 +99,8 @@ dol_fiche_head($head, 'proxy', $langs->trans("Security"), -1);
 
 if ($conf->use_javascript_ajax)
 {
-    print "\n".'<script type="text/javascript" language="javascript">';
-    print 'jQuery(document).ready(function () {
+	print "\n".'<script type="text/javascript" language="javascript">';
+	print 'jQuery(document).ready(function () {
                 function initfields()
                 {
                     if (jQuery("#MAIN_PROXY_USE").val()==\'1\')
@@ -117,7 +117,7 @@ if ($conf->use_javascript_ajax)
                     initfields();
                 });
            })';
-    print '</script>'."\n";
+	print '</script>'."\n";
 }
 
 
diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php
index 454fe1c4a8f..95338903ade 100644
--- a/htdocs/admin/reception_extrafields.php
+++ b/htdocs/admin/reception_extrafields.php
@@ -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\">".$langs->trans("NewAttribute")."</a>";
-    print "</div>";
+	print '<div class="tabsAction">';
+	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+	print "</div>";
 }
 
 
@@ -103,10 +103,10 @@ if ($action != 'create' && $action != 'edit')
 
 if ($action == 'create')
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print "<br>";
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -116,10 +116,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index 462326316b2..b64c01c5f00 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -35,7 +35,7 @@ $langs->loadLangs(array("admin","resource"));
 
 // Security check
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 $action = GETPOST('action', 'alpha');
 
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index bcb3b5769ee..39a757bbf9c 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -86,9 +86,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>";
 }
 
 
@@ -101,9 +101,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -113,10 +113,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index 78c31291414..8924741df52 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -84,9 +84,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>";
 }
 
 
@@ -99,9 +99,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -111,10 +111,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 194c871958d..0835138227b 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -70,27 +70,27 @@ $configfileparameters=array(
 							'?dolibarr_main_auth_ldap_admin_login',
 							'?dolibarr_main_auth_ldap_admin_pass',
 							'?dolibarr_main_auth_ldap_debug',
-                            'separator',
-                            '?dolibarr_lib_ADODB_PATH',
+							'separator',
+							'?dolibarr_lib_ADODB_PATH',
 							'?dolibarr_lib_FPDF_PATH',
-	                        '?dolibarr_lib_TCPDF_PATH',
+							'?dolibarr_lib_TCPDF_PATH',
 							'?dolibarr_lib_FPDI_PATH',
-                            '?dolibarr_lib_TCPDI_PATH',
+							'?dolibarr_lib_TCPDI_PATH',
 							'?dolibarr_lib_NUSOAP_PATH',
-                            '?dolibarr_lib_PHPEXCEL_PATH',
-                            '?dolibarr_lib_GEOIP_PATH',
+							'?dolibarr_lib_PHPEXCEL_PATH',
+							'?dolibarr_lib_GEOIP_PATH',
 							'?dolibarr_lib_ODTPHP_PATH',
-                            '?dolibarr_lib_ODTPHP_PATHTOPCLZIP',
-						    '?dolibarr_js_CKEDITOR',
-						    '?dolibarr_js_JQUERY',
-						    '?dolibarr_js_JQUERY_UI',
-						    '?dolibarr_js_JQUERY_FLOT',
+							'?dolibarr_lib_ODTPHP_PATHTOPCLZIP',
+							'?dolibarr_js_CKEDITOR',
+							'?dolibarr_js_JQUERY',
+							'?dolibarr_js_JQUERY_UI',
+							'?dolibarr_js_JQUERY_FLOT',
 							'?dolibarr_font_DOL_DEFAULT_TTF',
-                            '?dolibarr_font_DOL_DEFAULT_TTF_BOLD',
+							'?dolibarr_font_DOL_DEFAULT_TTF_BOLD',
 							'separator',
 							'?dolibarr_mailing_limit_sendbyweb',
 							'?dolibarr_mailing_limit_sendbycli',
-                            '?dolibarr_strict_mode'
+							'?dolibarr_strict_mode'
 						);
 $configfilelib=array(
 //					'separator',
@@ -121,20 +121,20 @@ $configfilelib=array(
 					'dolibarr_main_auth_ldap_admin_pass',
 					'dolibarr_main_auth_ldap_debug',
 					'separator',
-                    'dolibarr_lib_ADODB_PATH',
-                    'dolibarr_lib_TCPDF_PATH',
-                    'dolibarr_lib_FPDI_PATH',
+					'dolibarr_lib_ADODB_PATH',
+					'dolibarr_lib_TCPDF_PATH',
+					'dolibarr_lib_FPDI_PATH',
 					'dolibarr_lib_NUSOAP_PATH',
-                    'dolibarr_lib_PHPEXCEL_PATH',
-                    'dolibarr_lib_GEOIP_PATH',
+					'dolibarr_lib_PHPEXCEL_PATH',
+					'dolibarr_lib_GEOIP_PATH',
 					'dolibarr_lib_ODTPHP_PATH',
-                    'dolibarr_lib_ODTPHP_PATHTOPCLZIP',
-                    'dolibarr_js_CKEDITOR',
-                    'dolibarr_js_JQUERY',
-                    'dolibarr_js_JQUERY_UI',
-                    'dolibarr_js_JQUERY_FLOT',
+					'dolibarr_lib_ODTPHP_PATHTOPCLZIP',
+					'dolibarr_js_CKEDITOR',
+					'dolibarr_js_JQUERY',
+					'dolibarr_js_JQUERY_UI',
+					'dolibarr_js_JQUERY_FLOT',
 					'dolibarr_font_DOL_DEFAULT_TTF',
-                    'dolibarr_font_DOL_DEFAULT_TTF_BOLD',
+					'dolibarr_font_DOL_DEFAULT_TTF_BOLD',
 					'separator',
 					'Limit nb of email sent by page',
 					'Strict mode is on/off'
@@ -155,19 +155,19 @@ foreach($configfileparameters as $key)
 
 	if (empty($ignore))
 	{
-        $newkey = preg_replace('/^\?/', '', $key);
+		$newkey = preg_replace('/^\?/', '', $key);
 
-        if (preg_match('/^\?/', $key) && empty(${$newkey}))
-        {
-            $i++;
-            continue;    // We discard parametes starting with ?
-        }
+		if (preg_match('/^\?/', $key) && empty(${$newkey}))
+		{
+			$i++;
+			continue;    // We discard parametes starting with ?
+		}
 
-        if ($newkey == 'separator' && $lastkeyshown == 'separator')
-        {
-            $i++;
-            continue;
-        }
+		if ($newkey == 'separator' && $lastkeyshown == 'separator')
+		{
+			$i++;
+			continue;
+		}
 
 		print '<tr class="oddeven">';
 		if ($newkey == 'separator')
@@ -233,17 +233,17 @@ if ($resql)
 	$i = 0;
 
 	while ($i < $num)
-    {
-    	$obj = $db->fetch_object($resql);
+	{
+		$obj = $db->fetch_object($resql);
 
-    	print '<tr class="oddeven">';
-    	print '<td>'.$obj->name.'</td>'."\n";
-    	print '<td>'.$obj->value.'</td>'."\n";
-    	if (empty($conf->multicompany->enabled) || !$user->entity) print '<td>'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled
-    	print "</tr>\n";
+		print '<tr class="oddeven">';
+		print '<td>'.$obj->name.'</td>'."\n";
+		print '<td>'.$obj->value.'</td>'."\n";
+		if (empty($conf->multicompany->enabled) || !$user->entity) print '<td>'.$obj->entity.'</td>'."\n";	// If superadmin or multicompany disabled
+		print "</tr>\n";
 
-    	$i++;
-    }
+		$i++;
+	}
 }
 
 print '</table>';
diff --git a/htdocs/admin/system/modules.php b/htdocs/admin/system/modules.php
index 7a53b95fcf2..dce23de6270 100644
--- a/htdocs/admin/system/modules.php
+++ b/htdocs/admin/system/modules.php
@@ -54,17 +54,17 @@ $i=0;
 foreach($modulesdir as $dir)
 {
 	$handle=@opendir(dol_osencode($dir));
-    if (is_resource($handle))
-    {
-    	while (($file = readdir($handle))!==false)
-    	{
-    		if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
-    		{
-    			$modName = substr($file, 0, dol_strlen($file) - 10);
+	if (is_resource($handle))
+	{
+		while (($file = readdir($handle))!==false)
+		{
+			if (is_readable($dir.$file) && substr($file, 0, 3) == 'mod' && substr($file, dol_strlen($file) - 10) == '.class.php')
+			{
+				$modName = substr($file, 0, dol_strlen($file) - 10);
 
-    			if ($modName)
-    			{
-    				//print 'xx'.$dir.$file.'<br>';
+				if ($modName)
+				{
+					//print 'xx'.$dir.$file.'<br>';
 					if (in_array($file, $modules_files))
 					{
 						// File duplicate
@@ -77,13 +77,13 @@ foreach($modulesdir as $dir)
 						if (class_exists($modName))
 						{
 							try {
-	    						$objMod = new $modName($db);
+								$objMod = new $modName($db);
 
-			    				$modules[$objMod->numero]=$objMod;
-			    				$modules_names[$objMod->numero]=$objMod->name;
-	    						$modules_files[$objMod->numero]=$file;
-	    						$modules_fullpath[$file]=$dir.$file;
-	    						$picto[$objMod->numero]=(isset($objMod->picto) && $objMod->picto)?$objMod->picto:'generic';
+								$modules[$objMod->numero]=$objMod;
+								$modules_names[$objMod->numero]=$objMod->name;
+								$modules_files[$objMod->numero]=$file;
+								$modules_fullpath[$file]=$dir.$file;
+								$picto[$objMod->numero]=(isset($objMod->picto) && $objMod->picto)?$objMod->picto:'generic';
 							}
 							catch(Exception $e)
 							{
@@ -95,11 +95,11 @@ foreach($modulesdir as $dir)
 							print "Warning bad descriptor file : ".$dir.$file." (Class ".$modName." not found into file)<br>";
 						}
 					}
-    			}
-    		}
-    	}
-    	closedir($handle);
-    }
+				}
+			}
+		}
+		closedir($handle);
+	}
 }
 
 print '<div class="div-table-responsive-no-min">';
@@ -120,15 +120,15 @@ foreach($sortorder as $numero=>$name)
 	// Module
 	print '<tr class="oddeven"><td width="300" class="nowrap">';
 	$alt=$name.' - '.$modules_files[$numero];
-    if (! empty($picto[$numero]))
-    {
-       	if (preg_match('/^\//', $picto[$numero])) print img_picto($alt, $picto[$numero], 'width="14px"', 1);
-       	else print img_object($alt, $picto[$numero], 'width="14px"');
-    }
-    else
-    {
-      	print img_object($alt, $picto[$numero], 'width="14px"');
-    }
+	if (! empty($picto[$numero]))
+	{
+	   	if (preg_match('/^\//', $picto[$numero])) print img_picto($alt, $picto[$numero], 'width="14px"', 1);
+	   	else print img_object($alt, $picto[$numero], 'width="14px"');
+	}
+	else
+	{
+	  	print img_object($alt, $picto[$numero], 'width="14px"');
+	}
 	print ' '.$modules[$numero]->getName();
 	print "</td>";
 	// Version
diff --git a/htdocs/admin/system/xdebug.php b/htdocs/admin/system/xdebug.php
index 56b452706f5..9ea68431b1a 100644
--- a/htdocs/admin/system/xdebug.php
+++ b/htdocs/admin/system/xdebug.php
@@ -41,54 +41,54 @@ print "<br>\n";
 
 if (!function_exists('xdebug_is_enabled'))
 {
-    print 'XDebug seems to be not installed. Function xdebug_is_enabled not found.';
-    llxFooter();
-    exit;
+	print 'XDebug seems to be not installed. Function xdebug_is_enabled not found.';
+	llxFooter();
+	exit;
 }
 
 
 if (function_exists('socket_create'))
 {
-    $address = ini_get('xdebug.remote_host')?ini_get('xdebug.remote_host'):'127.0.0.1';
-    $port = ini_get('xdebug.remote_port')?ini_get('xdebug.remote_port'):9000;
+	$address = ini_get('xdebug.remote_host')?ini_get('xdebug.remote_host'):'127.0.0.1';
+	$port = ini_get('xdebug.remote_port')?ini_get('xdebug.remote_port'):9000;
 
-    print "<strong>Current xdebug setup:</strong><br>\n";
-    print "* Remote debug setup:<br>\n";
-    print 'xdebug.remote_enable = '.ini_get('xdebug.remote_enable')."<br>\n";
-    print 'xdebug.remote_host = '.$address."<br>\n";
-    print 'xdebug.remote_port = '.$port."<br>\n";
-    print "* Profiler setup ";
-    if (function_exists('xdebug_get_profiler_filename')) print xdebug_get_profiler_filename()?"(currently on into file ".xdebug_get_profiler_filename().")":"(currently off)";
-    else print "(currenlty not available)";
-    print ":<br>\n";
-    print 'xdebug.profiler_enable = '.ini_get('xdebug.profiler_enable')."<br>\n";
-    print 'xdebug.profiler_enable_trigger = '.ini_get('xdebug.profiler_enable_trigger')."<br>\n";
-    print 'xdebug.profiler_output_dir = '.ini_get('xdebug.profiler_output_dir')."<br>\n";
-    print 'xdebug.profiler_output_name = '.ini_get('xdebug.profiler_output_name')."<br>\n";
-    print 'xdebug.profiler_append = '.ini_get('xdebug.profiler_append')."<br>\n";
-    print "<br>\n";
+	print "<strong>Current xdebug setup:</strong><br>\n";
+	print "* Remote debug setup:<br>\n";
+	print 'xdebug.remote_enable = '.ini_get('xdebug.remote_enable')."<br>\n";
+	print 'xdebug.remote_host = '.$address."<br>\n";
+	print 'xdebug.remote_port = '.$port."<br>\n";
+	print "* Profiler setup ";
+	if (function_exists('xdebug_get_profiler_filename')) print xdebug_get_profiler_filename()?"(currently on into file ".xdebug_get_profiler_filename().")":"(currently off)";
+	else print "(currenlty not available)";
+	print ":<br>\n";
+	print 'xdebug.profiler_enable = '.ini_get('xdebug.profiler_enable')."<br>\n";
+	print 'xdebug.profiler_enable_trigger = '.ini_get('xdebug.profiler_enable_trigger')."<br>\n";
+	print 'xdebug.profiler_output_dir = '.ini_get('xdebug.profiler_output_dir')."<br>\n";
+	print 'xdebug.profiler_output_name = '.ini_get('xdebug.profiler_output_name')."<br>\n";
+	print 'xdebug.profiler_append = '.ini_get('xdebug.profiler_append')."<br>\n";
+	print "<br>\n";
 
-    echo "To run a debug session, add parameter<br>";
-    echo "* XDEBUG_SESSION_START=aname on your URL. To stop, remove cookie XDEBUG_SESSION_START.<br>\n";
-    echo "To run a profiler session (when xdebug.profiler_enable_trigger=1), add parameter<br>\n";
-    echo "* XDEBUG_PROFILE=aname on each URL.<br>";
-    print "<br>";
+	echo "To run a debug session, add parameter<br>";
+	echo "* XDEBUG_SESSION_START=aname on your URL. To stop, remove cookie XDEBUG_SESSION_START.<br>\n";
+	echo "To run a profiler session (when xdebug.profiler_enable_trigger=1), add parameter<br>\n";
+	echo "* XDEBUG_PROFILE=aname on each URL.<br>";
+	print "<br>";
 
-    print "<strong>Test debugger server (Eclipse for example):</strong><br>\n";
-    $socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-    if (empty($socket)) die('Unable to prepare a socket');
-    //socket_bind($sock, $address, $port) or die('Unable to bind on address='.$address.' port='.$port);
-    //socket_listen($sock);
-    //$client = socket_accept($sock);
-    $client=socket_connect($socket, $address, $port);
-    if ($client)
-    {
-        echo "Connection established: ".$client." - address=".$address." port=".$port."<br>\n";
-        echo "There is a Remote debug server at this address.<br>\n";
-        echo "<br>\n";
-        echo "To be sure this debugger accepts input from your PHP server and xdebug, be sure to have\n";
-        echo "your php.ini file with this :<br>\n";
-        echo '<textarea cols="80" rows="16">'."xdebug.remote_enable=on
+	print "<strong>Test debugger server (Eclipse for example):</strong><br>\n";
+	$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
+	if (empty($socket)) die('Unable to prepare a socket');
+	//socket_bind($sock, $address, $port) or die('Unable to bind on address='.$address.' port='.$port);
+	//socket_listen($sock);
+	//$client = socket_accept($sock);
+	$client=socket_connect($socket, $address, $port);
+	if ($client)
+	{
+		echo "Connection established: ".$client." - address=".$address." port=".$port."<br>\n";
+		echo "There is a Remote debug server at this address.<br>\n";
+		echo "<br>\n";
+		echo "To be sure this debugger accepts input from your PHP server and xdebug, be sure to have\n";
+		echo "your php.ini file with this :<br>\n";
+		echo '<textarea cols="80" rows="16">'."xdebug.remote_enable=on
 xdebug.remote_handle=dbgp
 xdebug.remote_host=localhost
 xdebug.remote_port=9000
@@ -103,23 +103,23 @@ xdebug.show_mem_delta=1
 xdebug.trace_output_dir=/tmp/trace
 xdebug.auto_trace=0
 </textarea>\n";
-        print "<br><br>\n";
-        echo 'Then check in your debug server (Eclipse), you have setup:<br>
+		print "<br><br>\n";
+		echo 'Then check in your debug server (Eclipse), you have setup:<br>
 	         XDebug with same port than in php.ini<br>
 	         Allow Remote debug=yes or prompt<br>'."\n";
-        print "<br>\n";
-    }
-    else
-    {
-        print socket_strerror(socket_last_error());
-        echo "Failed to connect to address=".$address." port=".$port."<br>\n";
-        echo "There is no Remote debug server at this address.\n";
-    }
-    socket_close($socket);
+		print "<br>\n";
+	}
+	else
+	{
+		print socket_strerror(socket_last_error());
+		echo "Failed to connect to address=".$address." port=".$port."<br>\n";
+		echo "There is no Remote debug server at this address.\n";
+	}
+	socket_close($socket);
 }
 else
 {
-    print "Can't test if PHPDebug is OK as PHP socket functions are not enabled.";
+	print "Can't test if PHPDebug is OK as PHP socket functions are not enabled.";
 }
 
 
diff --git a/htdocs/admin/ticket_extrafields.php b/htdocs/admin/ticket_extrafields.php
index 18d5eee40a6..d7be1d058e6 100644
--- a/htdocs/admin/ticket_extrafields.php
+++ b/htdocs/admin/ticket_extrafields.php
@@ -36,7 +36,7 @@ $form = new Form($db);
 $tmptype2label = ExtraFields::$type2label;
 $type2label = array('');
 foreach ($tmptype2label as $key => $val) {
-    $type2label[$key] = $langs->trans($val);
+	$type2label[$key] = $langs->trans($val);
 }
 
 $action = GETPOST('action', 'alpha');
@@ -44,7 +44,7 @@ $attrname = GETPOST('attrname', 'alpha');
 $elementtype = 'ticket'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) {
-    accessforbidden();
+	accessforbidden();
 }
 
 
@@ -79,9 +79,9 @@ dol_fiche_end();
 
 // Buttons
 if ($action != 'create' && $action != 'edit') {
-    print '<div class="tabsAction">';
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . "?action=create\">" . $langs->trans("NewAttribute") . '</a></div>';
-    print "</div>";
+	print '<div class="tabsAction">';
+	print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . "?action=create\">" . $langs->trans("NewAttribute") . '</a></div>';
+	print "</div>";
 }
 
 /* ************************************************************************** */
@@ -91,10 +91,10 @@ if ($action != 'create' && $action != 'edit') {
 /* ************************************************************************** */
 
 if ($action == 'create') {
-    print "<br>";
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print "<br>";
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    include DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_add.tpl.php';
+	include DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -103,10 +103,10 @@ if ($action == 'create') {
 /*                                                                            */
 /* ************************************************************************** */
 if ($action == 'edit' && !empty($attrname)) {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    include DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_edit.tpl.php';
+	include DOL_DOCUMENT_ROOT . '/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/admin/tools/listsessions.php b/htdocs/admin/tools/listsessions.php
index 28d4fc3d51f..de526b725da 100644
--- a/htdocs/admin/tools/listsessions.php
+++ b/htdocs/admin/tools/listsessions.php
@@ -167,7 +167,7 @@ if ($savehandler == 'files')
 
 	if (count($listofsessions) == 0)
 	{
-		print '<tr '.$bc[false].'><td colspan="6">'.$langs->trans("NoSessionFound", $savepath, $openbasedir).'</td></tr>';
+		print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoSessionFound", $savepath, $openbasedir).'</td></tr>';
 	}
 	print "</table>";
 }
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index 664cda18916..6d1f40ec4a0 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -54,9 +54,9 @@ $version='0.0';
 
 if ($action == 'getlastversion')
 {
-    $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
-    //var_dump($result['content']);
-    $sfurl = simplexml_load_string($result['content']);
+	$result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+	//var_dump($result['content']);
+	$sfurl = simplexml_load_string($result['content']);
 }
 
 
@@ -75,39 +75,39 @@ print $langs->trans("CurrentVersion").' : <strong>'.DOL_VERSION.'</strong><br>';
 
 if (function_exists('curl_init'))
 {
-    $conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
+	$conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
 
-    if ($action == 'getlastversion')
-    {
-        if ($sfurl)
-        {
-            $i=0;
-            while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
-            {
-                $title=$sfurl->channel[0]->item[$i]->title;
-                if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
-                {
-                    $newversion=$reg[1];
-                    $newversionarray=explode('.', $newversion);
-                    $versionarray=explode('.', $version);
-                    //var_dump($newversionarray);var_dump($versionarray);
-                    if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
-                }
-                $i++;
-            }
+	if ($action == 'getlastversion')
+	{
+		if ($sfurl)
+		{
+			$i=0;
+			while (! empty($sfurl->channel[0]->item[$i]->title) && $i < 10000)
+			{
+				$title=$sfurl->channel[0]->item[$i]->title;
+				if (preg_match('/([0-9]+\.([0-9\.]+))/', $title, $reg))
+				{
+					$newversion=$reg[1];
+					$newversionarray=explode('.', $newversion);
+					$versionarray=explode('.', $version);
+					//var_dump($newversionarray);var_dump($versionarray);
+					if (versioncompare($newversionarray, $versionarray) > 0) $version=$newversion;
+				}
+				$i++;
+			}
 
-            // Show version
-        	print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
-        }
-        else
-        {
-            print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
-        }
-    }
-    else
-    {
-        print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
-    }
+			// Show version
+			print $langs->trans("LastStableVersion").' : <b>'. (($version != '0.0')?$version:$langs->trans("Unknown")) .'</b><br>';
+		}
+		else
+		{
+			print $langs->trans("LastStableVersion").' : <b>' .$langs->trans("UpdateServerOffline").'</b><br>';
+		}
+	}
+	else
+	{
+		print $langs->trans("LastStableVersion").' : <a href="'.$_SERVER["PHP_SELF"].'?action=getlastversion" class="button">' .$langs->trans("Check").'</a><br>';
+	}
 }
 
 print '<br>';
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 7a9ef9ad24d..6ccdab6c179 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -56,6 +56,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 
 $url = $_SERVER['PHP_SELF'];
+if (preg_match('/api\/index\.php$/', $url)) {	// sometimes $_SERVER['PHP_SELF'] is 'api\/index\.php' instead of 'api\/index\.php/explorer.php' or 'api\/index\.php/method'
+	$url = $_SERVER['PHP_SELF'].$_SERVER['PATH_INFO'];
+}
 // Fix for some NGINX setups (this should not be required even with NGINX, however setup of NGINX are often mysterious and this may help is such cases)
 if (! empty($conf->global->MAIN_NGINX_FIX))
 {
diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/assets_extrafields.php
index d4ae2bd2930..9d224fe079e 100644
--- a/htdocs/asset/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/assets_extrafields.php
@@ -76,9 +76,9 @@ dol_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
-    print "</div>";
+	print '<div class="tabsAction">';
+	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print "</div>";
 }
 
 
@@ -90,10 +90,10 @@ if ($action != 'create' && $action != 'edit')
 
 if ($action == 'create')
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print "<br>";
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -103,10 +103,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index b4ff4ebac68..b0ab945f543 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -203,7 +203,7 @@ if (($id || $ref) && $action == 'edit')
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create')))
 {
-	$res = $object->fetch_optionals($object->id);
+	$res = $object->fetch_optionals();
 
 	$head = asset_prepare_head($object);
 	dol_fiche_head($head, 'card', $langs->trans("Asset"), -1, 'generic');
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 20f189dd99f..e298e0e6540 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -61,28 +61,28 @@ if (! empty($conf->global->BARCODE_PRODUCT_ADDON_NUM))
 		$dir = dol_buildpath($dirroot, 0);
 
 		$handle = @opendir($dir);
-	    if (is_resource($handle))
-	    {
-	    	while (($file = readdir($handle))!==false)
-	    	{
-	    		if (preg_match('/^mod_barcode_product_.*php$/', $file))
-	    		{
-	    			$file = substr($file, 0, dol_strlen($file)-4);
+		if (is_resource($handle))
+		{
+			while (($file = readdir($handle))!==false)
+			{
+				if (preg_match('/^mod_barcode_product_.*php$/', $file))
+				{
+					$file = substr($file, 0, dol_strlen($file)-4);
 
-	    		    try {
-	        			dol_include_once($dirroot.$file.'.php');
-	    			}
-	    			catch(Exception $e)
-	    			{
-	    			    dol_syslog($e->getMessage(), LOG_ERR);
-	    			}
+					try {
+						dol_include_once($dirroot.$file.'.php');
+					}
+					catch(Exception $e)
+					{
+						dol_syslog($e->getMessage(), LOG_ERR);
+					}
 
-	    			$modBarCodeProduct = new $file();
-	    			break;
-	    		}
-	    	}
-	    	closedir($handle);
-	    }
+					$modBarCodeProduct = new $file();
+					break;
+				}
+			}
+			closedir($handle);
+		}
 	}
 }
 
diff --git a/htdocs/blockedlog/ajax/block-add.php b/htdocs/blockedlog/ajax/block-add.php
index f38efde42b2..92ccd8af369 100644
--- a/htdocs/blockedlog/ajax/block-add.php
+++ b/htdocs/blockedlog/ajax/block-add.php
@@ -37,8 +37,8 @@ $element = GETPOST('element', 'alpha');
 $action = GETPOST('action', 'alpha');
 
 if ($element === 'facture') {
-    require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 	$facture = new Facture($db);
 	if($facture->fetch($id)>0) {
diff --git a/htdocs/blockedlog/lib/blockedlog.lib.php b/htdocs/blockedlog/lib/blockedlog.lib.php
index 13c7ac61d1a..998a97e9bab 100644
--- a/htdocs/blockedlog/lib/blockedlog.lib.php
+++ b/htdocs/blockedlog/lib/blockedlog.lib.php
@@ -53,13 +53,13 @@ function blockedlogadmin_prepare_head()
 
 	$object=new stdClass();
 
-    // 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
+	// 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, 'blockedlog');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'blockedlog', 'remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index c4146660053..4a919d7bb2a 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -549,7 +549,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	    $result = $object->getLinesArray();
 
 	    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="' . $_SESSION ['newtoken'].'">
+    	<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.'">
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index e33394edcf7..f8ecfa11996 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -482,7 +482,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
@@ -502,7 +502,7 @@ foreach ($object->fields as $key => $val)
 		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]).'">';
+		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
@@ -582,6 +582,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
     	elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
     	if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+    	if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
         if (!empty($arrayfields['t.'.$key]['checked']))
         {
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 9e69eda2cd3..699065520da 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -60,10 +60,9 @@ function printDropdownBookmarksList()
     }
 
     $searchForm = '<!-- form with POST method by default, will be replaced with GET for external link by js -->'."\n";
-    $searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action="" onsubmit="return false" >';
+    $searchForm .= '<form id="top-menu-action-bookmark" name="actionbookmark" method="POST" action=""'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)?'onsubmit="return false"':'').'>';
     $searchForm .= '<input type="hidden" name="token" value="'.newToken().'">';
-    $searchForm .= '<input name="bookmark" id="top-bookmark-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Bookmarks').'" autocomplete="off" >';
-    $searchForm .= '</form>';
+
 
     // Url to list bookmark
     $listbtn = '<a class="top-menu-dropdown-link" title="'.$langs->trans('AddThisPageToBookmarks').'" href="'.DOL_URL_ROOT.'/bookmarks/list.php" >';
@@ -79,7 +78,6 @@ function printDropdownBookmarksList()
         $newbtn .= img_picto('', 'bookmark', '', false, 0, 0, '', 'paddingright').dol_escape_htmltag($langs->trans('AddThisPageToBookmarks')).'</a>';
     }
 
-    $bookmarkList = '<div id="dropdown-bookmarks-list" >';
     // Menu with list of bookmarks
     $sql = "SELECT rowid, title, url, target FROM ".MAIN_DB_PREFIX."bookmark";
     $sql .= " WHERE (fk_user = ".$user->id." OR fk_user is NULL OR fk_user = 0)";
@@ -87,59 +85,126 @@ function printDropdownBookmarksList()
     $sql .= " ORDER BY position";
     if ($resql = $db->query($sql))
     {
-    	$i = 0;
-    	while (($conf->global->BOOKMARKS_SHOW_IN_MENU == 0 || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
-    	{
-    		$bookmarkList .= '<a class="dropdown-item bookmark-item" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
-    		$bookmarkList .= dol_escape_htmltag($obj->title);
-    		$bookmarkList .= '</a>';
-    		$i++;
+    	if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+	    	$bookmarkList = '<div id="dropdown-bookmarks-list" >';
+	    	$i = 0;
+	    	while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
+	    	{
+	    		$bookmarkList .= '<a class="dropdown-item bookmark-item" id="bookmark-item-'.$obj->rowid.'" data-id="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' href="'.dol_escape_htmltag($obj->url).'" >';
+	    		$bookmarkList .= dol_escape_htmltag($obj->title);
+	    		$bookmarkList .= '</a>';
+	    		$i++;
+	    	}
+	    	$bookmarkList .= '</div>';
+
+	    	$searchForm .= '<input name="bookmark" id="top-bookmark-search-input" class="dropdown-search-input" placeholder="'.$langs->trans('Bookmarks').'" autocomplete="off" >';
+    	} else {
+    		$searchForm .= '<select name"=bookmark" id="boxbookmark" class="topmenu-bookmark-dropdown .dropdown-toggle">';
+    		//$searchForm .= '<option>--'.$langs->trans("Bookmarks").'--</option>';
+    		$searchForm .= '<option hidden value="listbookmarks" class="optiongrey" selected rel="'.DOL_URL_ROOT.'/bookmarks/list.php">'.$langs->trans('Bookmarks').'</option>';
+    		$searchForm .= '<option value="listbookmark" class="optionblue" rel="'.dol_escape_htmltag(DOL_URL_ROOT.'/bookmarks/list.php').'" ';
+    		$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...').'">';
+    		$searchForm .= dol_escape_htmltag($user->rights->bookmark->creer ? $langs->trans('EditBookmarks') : $langs->trans('ListOfBookmarks')).'...</option>';
+    		// Url to go on create new bookmark page
+    		if (! empty($user->rights->bookmark->creer))
+    		{
+    			$urltoadd=DOL_URL_ROOT.'/bookmarks/card.php?action=create&amp;url='.urlencode($url);
+    			$searchForm .= '<option value="newbookmark" class="optionblue" rel="'.dol_escape_htmltag($urltoadd).'"';
+    			$searchForm .= ' data-html="'.dol_escape_htmltag(img_picto('', 'bookmark').' '.$langs->trans('AddThisPageToBookmarks').'...').'">'.dol_escape_htmltag($langs->trans('AddThisPageToBookmarks').'...').'</option>';
+    		}
+    		$i = 0;
+    		while ((empty($conf->global->BOOKMARKS_SHOW_IN_MENU) || $i < $conf->global->BOOKMARKS_SHOW_IN_MENU) && $obj = $db->fetch_object($resql))
+    		{
+    			$searchForm .= '<option name="bookmark'.$obj->rowid.'" value="'.$obj->rowid.'" '.($obj->target == 1 ? ' target="_blank"' : '').' rel="'.dol_escape_htmltag($obj->url).'" >';
+    			$searchForm .= dol_escape_htmltag($obj->title);
+    			$searchForm .= '</option>';
+    			$i++;
+    		}
+    		$searchForm .= '</select>';
     	}
     }
     else
     {
     	dol_print_error($db);
     }
-    $bookmarkList .= '</div>';
 
-    $html = '
-        <!-- search input -->
-        <div class="dropdown-header bookmark-header">
-            ' . $searchForm.'
-        </div>
-        ';
+    $searchForm .= '</form>';
 
-    $html .= '
-        <!-- Menu Body -->
-        <div class="bookmark-body dropdown-body">
-        '.$bookmarkList.'
-        </div>
-        ';
+    // Generate the return string
+    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+    	$html = $searchForm;
 
-    $html .= '
-        <!-- Menu Footer-->
-        <div class="bookmark-footer">
-                '.$newbtn.$listbtn.'
-            <div style="clear:both;"></div>
-        </div>
-    ';
+    	$html.='<!-- script to open selected choice -->
+				<script>
+	        	$(document).ready(function () {
+    			    jQuery("#boxbookmark").change(function() {
+			            var urlselected = jQuery("#boxbookmark option:selected").attr("rel");
+						if (! urlselected) console.log("Error, failed to get the URL to jump to from the rel attribute");
+			            var urltarget = jQuery("#boxbookmark option:selected").attr("target");
+			            if (! urltarget) { urltarget=""; }
+		                jQuery("form#top-menu-action-bookmark").attr("target",urltarget);
+			            jQuery("form#top-menu-action-bookmark").attr("action",urlselected);
 
-    $html .= '<script>
-            $( document ).on("keyup", "#top-bookmark-search-input", function () {
+			            console.log("We change select bookmark. We choose urlselected="+urlselected+" with target="+urltarget);
 
-                var filter = $(this).val(), count = 0;
-                $("#dropdown-bookmarks-list .bookmark-item").each(function () {
+			            // Method is POST for internal link, GET for external
+			            if (urlselected.startsWith(\'http\'))
+			            {
+			                var newmethod=\'GET\';
+			                jQuery("form#top-menu-action-bookmark").attr("method", newmethod);
+			                console.log("We change method to newmethod="+newmethod);
+				            jQuery("form#top-menu-action-bookmark").submit();
+			                console.log("We restore method to POST");
+							jQuery("form#top-menu-action-bookmark").attr("method", \'POST\');
+						}
+						else
+						{
+			            	jQuery("form#top-menu-action-bookmark").submit();
+						}
+		       		});
+    			})
+				</script>';
+    } else {
+    	$html = '
+	        <!-- search input -->
+	        <div class="dropdown-header bookmark-header">
+	            ' . $searchForm.'
+	        </div>
+	        ';
 
-                    if ($(this).text().search(new RegExp(filter, "i")) < 0) {
-                        $(this).addClass("hidden-search-result");
-                    } else {
-                        $(this).removeClass("hidden-search-result");
-                        count++;
-                    }
-                });
-                $("#top-bookmark-search-filter-count").text(count);
-            });
-		    </script>';
+	    $html .= '
+	        <!-- Menu Body -->
+	        <div class="bookmark-body dropdown-body">
+	        '.$bookmarkList.'
+	        </div>
+	        ';
+
+	    $html .= '
+	        <!-- Menu Footer-->
+	        <div class="bookmark-footer">
+	                '.$newbtn.$listbtn.'
+	            <div style="clear:both;"></div>
+	        </div>
+	    ';
+
+	    $html .= '<!-- script to open/close the popup -->
+				<script>
+	            $( document ).on("keyup", "#top-bookmark-search-input", function () {
+
+	                var filter = $(this).val(), count = 0;
+	                $("#dropdown-bookmarks-list .bookmark-item").each(function () {
+
+	                    if ($(this).text().search(new RegExp(filter, "i")) < 0) {
+	                        $(this).addClass("hidden-search-result");
+	                    } else {
+	                        $(this).removeClass("hidden-search-result");
+	                        count++;
+	                    }
+	                });
+	                $("#top-bookmark-search-filter-count").text(count);
+	            });
+			    </script>';
+    }
 
     return $html;
 }
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 7122e1b6f59..fcfe9905bae 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -74,11 +74,11 @@ if (is_array($hookmanager->resArray) && ! empty($hookmanager->resArray)) {
 <?php
 if (! empty($mysoc->logo_small))
 {
-    print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
+	print '<img class="logopos" alt="Logo company" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=mycompany&amp;file='.urlencode('logos/thumbs/'.$mysoc->logo_small).'">';
 }
 else
 {
-    print '<div class="logopos">'.$mysoc->name.'</div>';
+	print '<div class="logopos">'.$mysoc->name.'</div>';
 }
 ?>
 </div>
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index e8296b96beb..2e8afdb0089 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -243,7 +243,49 @@ class Categorie extends CommonObject
 	 */
 	public function __construct($db)
 	{
+		global $hookmanager;
+
 		$this->db = $db;
+
+		if (is_object($hookmanager)) {
+			$hookmanager->initHooks(array('category'));
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('constructCategory', $parameters, $this); // Note that $action and $object may have been modified by some hooks
+			if ($reshook >= 0 && !empty($hookmanager->resArray)) {
+				$mapList = $hookmanager->resArray;
+				$mapId   = $mapList['id'];
+				$mapCode = $mapList['code'];
+				self::$MAP_ID_TO_CODE[$mapId]  = $mapCode;
+				$this->MAP_ID[$mapCode]        = $mapId;
+				$this->MAP_CAT_FK[$mapCode]    = $mapList['cat_fk'];
+				$this->MAP_CAT_TABLE[$mapCode] = $mapList['cat_table'];
+				$this->MAP_OBJ_CLASS[$mapCode] = $mapList['obj_class'];
+				$this->MAP_OBJ_TABLE[$mapCode] = $mapList['obj_table'];
+			}
+		}
+	}
+
+	/**
+	 * Get map list
+	 *
+	 * @return	array
+	 */
+	public function getMapList()
+	{
+		$mapList = array();
+
+		foreach ($this->MAP_ID as $mapCode => $mapId) {
+			$mapList[] = array(
+				'id'        => $mapId,
+				'code'      => $mapCode,
+				'cat_fk'    => $this->MAP_CAT_FK[$mapCode],
+				'cat_table' => $this->MAP_CAT_TABLE[$mapCode],
+				'obj_class' => $this->MAP_OBJ_CLASS[$mapCode],
+				'obj_table' => $this->MAP_OBJ_TABLE[$mapCode]
+			);
+		}
+
+		return $mapList;
 	}
 
 	/**
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index d96fddca150..54a4ff9f1d2 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -40,6 +40,7 @@ $id = GETPOST('id', 'int');
 $type = (GETPOST('type', 'aZ09') ? GETPOST('type', 'aZ09') : Categorie::TYPE_PRODUCT);
 $catname = GETPOST('catname', 'alpha');
 
+$categstatic = new Categorie($db);
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
 
@@ -47,25 +48,13 @@ if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backwar
  * View
  */
 
-$categstatic = new Categorie($db);
 $form = new Form($db);
 
-if ($type == Categorie::TYPE_PRODUCT)       { $title=$langs->trans("ProductsCategoriesArea");  $typetext='product'; }
-elseif ($type == Categorie::TYPE_SUPPLIER)  { $title=$langs->trans("SuppliersCategoriesArea"); $typetext='supplier'; }
-elseif ($type == Categorie::TYPE_CUSTOMER)  { $title=$langs->trans("CustomersCategoriesArea"); $typetext='customer'; }
-elseif ($type == Categorie::TYPE_MEMBER)    { $title=$langs->trans("MembersCategoriesArea");   $typetext='member'; }
-elseif ($type == Categorie::TYPE_CONTACT)   { $title=$langs->trans("ContactsCategoriesArea");  $typetext='contact'; }
-elseif ($type == Categorie::TYPE_ACCOUNT)   { $title=$langs->trans("AccountsCategoriesArea");  $typetext='bank_account'; }
-elseif ($type == Categorie::TYPE_PROJECT)   { $title=$langs->trans("ProjectsCategoriesArea");  $typetext='project'; }
-elseif ($type == Categorie::TYPE_USER)      { $title=$langs->trans("UsersCategoriesArea");     $typetext='user'; }
-elseif ($type == Categorie::TYPE_WAREHOUSE) { $title=$langs->trans("StocksCategoriesArea");    $typetext='warehouse'; }
-elseif ($type == Categorie::TYPE_ACTIONCOMM) {
-    $title = $langs->trans("ActionCommCategoriesArea");
-    $typetext = 'actioncomm';
-} else {
-    $title = $langs->trans("CategoriesArea");
-    $typetext = 'unknown';
-}
+$typetext = $type;
+if ($type == Categorie::TYPE_ACCOUNT) 			$title = $langs->trans('AccountsCategoriesArea');
+elseif ($type == Categorie::TYPE_WAREHOUSE) 	$title = $langs->trans('StocksCategoriesArea');
+elseif ($type == Categorie::TYPE_ACTIONCOMM)	$title = $langs->trans('ActionCommCategoriesArea');
+else 											$title = $langs->trans(ucfirst($type). 'sCategoriesArea');
 
 $arrayofjs=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
 $arrayofcss=array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php
index ed6091e3568..b9fd23c1a3d 100644
--- a/htdocs/categories/photos.php
+++ b/htdocs/categories/photos.php
@@ -36,15 +36,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/categories.lib.php';
 $langs->loadlangs(array('categories', 'bills'));
 
 
-$id = GETPOST('id', 'int');
-$ref = GETPOST('ref');
-$type = GETPOST('type');
-$action = GETPOST('action', 'aZ09');
+$id      = GETPOST('id', 'int');
+$label   = GETPOST('label', 'alpha');
+$type    = GETPOST('type');
+$action  = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm');
 
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
-
-if ($id == "")
+if ($id == '' && $label == '')
 {
     dol_print_error('', 'Missing parameter id');
     exit();
@@ -54,13 +52,17 @@ if ($id == "")
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-if ($id > 0)
-{
-	$result = $object->fetch($id);
-
-	$upload_dir = $conf->categorie->multidir_output[$object->entity];
+$result = $object->fetch($id, $label, $type);
+if ($result <= 0) {
+	dol_print_error($db, $object->error); exit;
 }
+$object->fetch_optionals();
+if ($result <= 0) {
+	dol_print_error($db, $object->error); exit;
+}
+$upload_dir = $conf->categorie->multidir_output[$object->entity];
 
+if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
 /*
  * Actions
@@ -126,7 +128,7 @@ if ($object->id)
 	dol_fiche_head($head, 'photos', $title, -1, 'category');
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("BackToList").'</a>';
-
+	$object->next_prev_filter = ' type = ' . $object->type;
 	$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);
@@ -136,7 +138,7 @@ if ($object->id)
 	}
 	$morehtmlref.='</div>';
 
-	dol_banner_tab($object, 'ref', $linkback, ($user->socid?0:1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+	dol_banner_tab($object, 'label', $linkback, ($user->socid?0:1), 'label', 'label', $morehtmlref, '&type=' . $type, 0, '', '', 1);
 
 	/*
 	 * Confirmation de la suppression de photo
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 03ca6e977bd..697db116881 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -36,18 +36,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 $langs->loadLangs(array('categories', 'languages'));
 
 $id     = GETPOST('id', 'int');
-$ref    = GETPOST('ref', 'alpha');
+$label  = GETPOST('label', 'alpha');
 $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $type   = GETPOST('type', 'aZ09');
 
-if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
-
-// Security check
-$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
-$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
-
-if ($id == "")
+if ($id == '' && $label == '')
 {
 	dol_print_error('', 'Missing parameter id');
 	exit();
@@ -57,7 +51,16 @@ if ($id == "")
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
+$result = $object->fetch($id, $label, $type);
+if ($result <= 0) {
+	dol_print_error($db, $object->error); exit;
+}
+$object->fetch_optionals();
+if ($result <= 0) {
+	dol_print_error($db, $object->error); exit;
+}
 
+if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
 /*
  * Actions
@@ -159,8 +162,6 @@ $cancel != $langs->trans("Cancel") &&
     }
 }
 
-$result = $object->fetch($id, $ref);
-
 
 /*
  * View
@@ -197,7 +198,7 @@ if (!empty($object->multilangs))
 dol_fiche_head($head, 'translation', $title, -1, 'category');
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("BackToList").'</a>';
-
+$object->next_prev_filter = ' type = ' . $object->type;
 $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);
@@ -207,7 +208,7 @@ foreach ($ways as $way)
 }
 $morehtmlref .= '</div>';
 
-dol_banner_tab($object, 'ref', $linkback, ($user->socid ? 0 : 1), 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+dol_banner_tab($object, 'label', $linkback, ($user->socid ? 0 : 1), 'label', 'label', $morehtmlref, '&type=' . $type, 0, '', '', 1);
 
 print '<br>';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 62538da0273..c7242077da4 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2007       Patrick Raguin		<patrick.raguin@gmail.com>
  * Copyright (C) 2005-2012  Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.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
@@ -71,7 +72,7 @@ if ($id == "" && $label == "")
 $result = restrictedArea($user, 'categorie', $id, '&category');
 
 $object = new Categorie($db);
-$result = $object->fetch($id, $label);
+$result = $object->fetch($id, $label, $type);
 if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
@@ -80,7 +81,6 @@ if ($result <= 0) {
 	dol_print_error($db, $object->error); exit;
 }
 
-$type = $object->type;
 if (is_numeric($type)) $type = Categorie::$MAP_ID_TO_CODE[$type]; // For backward compatibility
 
 $extrafields = new ExtraFields($db);
@@ -222,8 +222,8 @@ $head = categories_prepare_head($object, $type);
 
 dol_fiche_head($head, 'card', $title, -1, 'category');
 $backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type);
-$linkback = '<a href="'.$backtolist.'\">'.$langs->trans("BackToList").'</a>';
-$object->next_prev_filter=" type = ".$object->type;
+$linkback = '<a href="'.$backtolist.'">'.$langs->trans("BackToList").'</a>';
+$object->next_prev_filter = ' type = ' . $object->type;
 $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);
@@ -233,7 +233,7 @@ foreach ($ways as $way)
 }
 $morehtmlref.='</div>';
 
-dol_banner_tab($object, 'label', $linkback, ($user->socid?0:1), 'label', 'label', $morehtmlref, '', 0, '', '', 1);
+dol_banner_tab($object, 'label', $linkback, ($user->socid?0:1), 'label', 'label', $morehtmlref, '&type=' . $type, 0, '', '', 1);
 
 
 /*
@@ -291,8 +291,18 @@ if ($user->rights->categorie->supprimer)
 
 print "</div>";
 
+if (! empty($user->rights->categorie->creer))
+{
+	$link = DOL_URL_ROOT.'/categories/card.php';
+	$link .= '?action=create';
+	$link .= '&type='.$type;
+	$link .= '&catorigin='.$object->id;
+	$link .= '&backtopage='.urlencode($_SERVER["PHP_SELF"].'?type='.$type.'&id='.$id);
 
-
+	print '<div class="right">';
+	print dolGetButtonTitle($langs->trans('NewCategory'), '', 'fa fa-plus-circle', $link);
+	print "</div>";
+}
 
 $cats = $object->get_filles();
 if ($cats < 0)
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index 31f608a9ee0..b9ad3015adf 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -143,19 +143,19 @@ if ($object->id > 0)
 	// Project
 	if (! empty($conf->projet->enabled))
 	{
-	    $langs->load("projects");
-	    //$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-	    $morehtmlref.=$langs->trans('Project') . ': ';
-	    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>';
-	        if ($proj->title) $morehtmlref.=' - '.$proj->title;
-	    } else {
-	        $morehtmlref.='';
-	    }
+		$langs->load("projects");
+		//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		$morehtmlref.=$langs->trans('Project') . ': ';
+		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>';
+			if ($proj->title) $morehtmlref.=' - '.$proj->title;
+		} else {
+			$morehtmlref.='';
+		}
 	}
 	$morehtmlref.='</div>';
 
@@ -253,9 +253,9 @@ if ($object->id > 0)
 
 	print '</table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 
 
 	$modulepart = 'actions';
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index b1d0ddc7ccc..6dfbc6c7f9c 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -248,7 +248,7 @@ $nav .= " &nbsp; (<a href=\"?year=".$nowyear."&amp;month=".$nowmonth."&amp;day="
 $picto = 'calendarweek';
 
 $nav .= ' &nbsp; <form name="dateselect" action="'.$_SERVER["PHP_SELF"].'?action=show_peruser'.$param.'">';
-$nav .= '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+$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.'">';
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index e8f7be097fa..f2cce5c8023 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -289,7 +289,7 @@ $nav .= " &nbsp; <a href=\"?year=".$next_year."&amp;month=".$next_month."&amp;da
 $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="' . $_SESSION ['newtoken'] . '">';
+$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 . '">';
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index fc53f90ed55..a0530e8c262 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -85,9 +85,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>";
 }
 
 
@@ -100,9 +100,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -112,10 +112,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 0900c5b032c..a21ea9d7d0a 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -992,7 +992,7 @@ else
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=settodraft&amp;id='.$object->id.'">'.$langs->trans("SetToDraft").'</a>';
 				}
 
-				if (($object->statut == 0 || $object->statut == 1) && $user->rights->mailing->creer)
+				if (($object->statut == 0 || $object->statut == 1 || $object->statut == 2) && $user->rights->mailing->creer)
 				{
 					if (!empty($conf->fckeditor->enabled) && !empty($conf->global->FCKEDITOR_ENABLE_MAILING))
 					{
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 9430fce4634..262493c9383 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -726,7 +726,7 @@ if (empty($reshook))
 	            $originLine = new $lineClassName($db);
 	            if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
 	            {
-	                $originLine->fetch_optionals($lineId);
+	                $originLine->fetch_optionals();
 	                $desc = $originLine->desc;
 	                $pu_ht = $originLine->subprice;
 	                $qty = $originLine->qty;
@@ -1523,7 +1523,7 @@ if ($action == 'create')
 			$dateinvoice = (empty($dateinvoice) ? (empty($conf->global->MAIN_AUTOFILL_DATE) ?-1 : '') : $dateinvoice);
 
 			// Replicate extrafields
-			$objectsrc->fetch_optionals($originid);
+			$objectsrc->fetch_optionals();
 			$object->array_options = $objectsrc->array_options;
 
 			if (!empty($conf->multicurrency->enabled))
@@ -1541,7 +1541,7 @@ if ($action == 'create')
 	$object = new Propal($db);
 
 	print '<form name="addprop" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($origin != 'project' && $originid) {
 		print '<input type="hidden" name="origin" value="'.$origin.'">';
@@ -1675,7 +1675,7 @@ if ($action == 'create')
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1);
+		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
 		print '</tr>';
@@ -2052,7 +2052,7 @@ if ($action == 'create')
 	print '</td><td>';
 	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editdate' && $usercancreate) {
 		print '<form name="editdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate">';
 		print $form->selectDate($object->date, 're', '', '', 0, "editdate");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
@@ -2078,7 +2078,7 @@ if ($action == 'create')
 	print '</td><td>';
 	if ($object->statut == Propal::STATUS_DRAFT && $action == 'editecheance' && $usercancreate) {
 		print '<form name="editecheance" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setecheance">';
 		print $form->selectDate($object->fin_validite, 'ech', '', '', '', "editecheance");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
@@ -2412,7 +2412,7 @@ if ($action == 'create')
 	$result = $object->getLinesArray();
 
 	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#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="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
 	<input type="hidden" name="id" value="' . $object->id.'">
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 66f4aa94fd2..a931af375c5 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -302,7 +302,8 @@ if ($resql)
 			print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
 
 			print '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
-			print '<td class="right">'.$propalstatic->LibStatut($obj->fk_statut, 5).'</td>';
+
+			print '<td class="right">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
 			print '</tr>';
 			$i++;
 		}
@@ -314,7 +315,7 @@ else dol_print_error($db);
 
 
 /*
- * Opened proposals
+ * Open proposals
  */
 if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 {
@@ -381,9 +382,10 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire)
 				$companystatic->canvas = $obj->canvas;
 				print '<td class="left">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>'."\n";
 
-				print '<td class="right">';
-				print dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
+				print '<td class="right">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>'."\n";
+
 				print '<td class="right">'.price($obj->total_ttc).'</td>';
+
 				print '<td align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>'."\n";
 				print '</tr>'."\n";
 				$i++;
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 651fa556e8a..c312591aeec 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -56,7 +56,7 @@ if (GETPOST('cancel', 'alpha') && !empty($backtopage))
      exit;
 }
 
-if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
+if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes')
 {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
@@ -122,6 +122,8 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
 		$newdiscount2->datec = $discount->datec;
 		$newdiscount1->tva_tx = $discount->tva_tx;
 		$newdiscount2->tva_tx = $discount->tva_tx;
+		$newdiscount1->vat_src_code = $discount->vat_src_code;
+		$newdiscount2->vat_src_code = $discount->vat_src_code;
 		$newdiscount1->amount_ttc = $amount_ttc_1;
 		$newdiscount2->amount_ttc = price2num($discount->amount_ttc - $newdiscount1->amount_ttc);
 		$newdiscount1->amount_ht = price2num($newdiscount1->amount_ttc / (1 + $newdiscount1->tva_tx / 100), 'MT');
@@ -129,6 +131,13 @@ if ($action == 'confirm_split' && GETPOST("confirm") == 'yes')
 		$newdiscount1->amount_tva = price2num($newdiscount1->amount_ttc - $newdiscount1->amount_ht);
 		$newdiscount2->amount_tva = price2num($newdiscount2->amount_ttc - $newdiscount2->amount_ht);
 
+		$newdiscount1->multicurrency_amount_ttc = $amount_ttc_1 * ($discount->multicurrency_amount_ttc / $discount->amount_ttc);
+		$newdiscount2->multicurrency_amount_ttc = price2num($discount->multicurrency_amount_ttc - $newdiscount1->multicurrency_amount_ttc);
+		$newdiscount1->multicurrency_amount_ht = price2num($newdiscount1->multicurrency_amount_ttc / (1 + $newdiscount1->tva_tx / 100), 'MT');
+		$newdiscount2->multicurrency_amount_ht = price2num($newdiscount2->multicurrency_amount_ttc / (1 + $newdiscount2->tva_tx / 100), 'MT');
+		$newdiscount1->multicurrency_amount_tva = price2num($newdiscount1->multicurrency_amount_ttc - $newdiscount1->multicurrency_amount_ht);
+		$newdiscount2->multicurrency_amount_tva = price2num($newdiscount2->multicurrency_amount_ttc - $newdiscount2->multicurrency_amount_ht);
+
 		$db->begin();
 		$discount->fk_facture_source = 0; // This is to delete only the require record (that we will recreate with two records) and not all family with same fk_facture_source
         // This is to delete only the require record (that we will recreate with two records) and not all family with same fk_invoice_supplier_source
@@ -154,12 +163,12 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
 
-	$amount_ht = GETPOST('amount_ht');
+	$amount_ht = price2num(GETPOST('amount_ht', 'alpha'));
 	$desc = GETPOST('desc', 'alpha');
 	$tva_tx = GETPOST('tva_tx', 'alpha');
 	$discount_type = !empty($_POST['discount_type']) ?GETPOST('discount_type', 'alpha') : 0;
 
-	if (price2num($amount_ht) > 0)
+	if ($amount_ht > 0)
 	{
 		$error = 0;
 		if (empty($desc))
@@ -196,7 +205,7 @@ if ($action == 'setremise' && $user->rights->societe->creer)
 	}
 	else
 	{
-		setEventMessages($langs->trans("ErrorFieldFormat", $langs->transnoentitiesnoconv("NewGlobalDiscount")), null, 'errors');
+		setEventMessages($langs->trans("ErrorFieldFormat", $langs->transnoentitiesnoconv("AmountHT")), null, 'errors');
 	}
 }
 
@@ -375,10 +384,10 @@ if ($socid > 0)
     	print '<span class="hideonsmartphone">&nbsp;'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
     	print '<tr><td>'.$langs->trans("VAT").'</td>';
     	print '<td>';
-    	print $form->load_tva('tva_tx', GETPOST('tva_tx'), $mysoc, $object);
+    	print $form->load_tva('tva_tx', GETPOSTISSET('tva_tx') ? GETPOST('tva_tx', 'alpha') : 0, $mysoc, $object, 0, 0, '', 0, 1);
     	print '</td></tr>';
     	print '<tr><td class="fieldrequired" >'.$langs->trans("NoteReason").'</td>';
-    	print '<td><input type="text" class="quatrevingtpercent" name="desc" value="'.GETPOST('desc', 'none').'"></td></tr>';
+    	print '<td><input type="text" class="quatrevingtpercent" name="desc" value="'.GETPOST('desc', 'alphanohtml').'"></td></tr>';
 
     	print "</table>";
 
@@ -409,7 +418,7 @@ if ($socid > 0)
 
 
 	/*
-	 * List remises fixes client restant en cours (= liees a aucune facture ni ligne de facture)
+	 * List not consumed available credits (= linked to no invoice and no invoice line)
 	 */
 
 	print load_fiche_titre($langs->trans("DiscountStillRemaining"));
@@ -421,7 +430,8 @@ if ($socid > 0)
 			print load_fiche_titre($langs->trans("CustomerDiscounts"), '', '');
 		}
 
-		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
+		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.vat_src_code,";
+		$sql .= " rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
 		$sql .= " rc.datec as dc, rc.description,";
 		$sql .= " rc.fk_facture_source,";
 		$sql .= " u.login, u.rowid as user_id,";
@@ -510,7 +520,7 @@ if ($socid > 0)
 	    			{
 	    			    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 	    			}
-	    			print '<td class="right">'.vatrate($obj->tva_tx, true).'</td>';
+	    			print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 	    			print '<td class="right">'.price($obj->amount_ttc).'</td>';
 	    			if (!empty($conf->multicurrency->enabled))
 	    			{
@@ -577,7 +587,8 @@ if ($socid > 0)
 		/*
 		 * Liste remises fixes fournisseur restant en cours (= liees a aucune facture ni ligne de facture)
 		 */
-		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
+		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.vat_src_code,";
+		$sql .= " rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
 		$sql .= " rc.datec as dc, rc.description,";
 		$sql .= " rc.fk_invoice_supplier_source,";
 		$sql .= " u.login, u.rowid as user_id,";
@@ -666,7 +677,7 @@ if ($socid > 0)
 					{
 					    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
-					print '<td class="right">'.vatrate($obj->tva_tx, true).'</td>';
+					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
@@ -744,7 +755,8 @@ if ($socid > 0)
 		}
 
 		// Discount linked to invoice lines
-		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
+		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.vat_src_code,";
+		$sql .= " rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
 		$sql .= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture_source,";
 		$sql .= " u.login, u.rowid as user_id,";
 		$sql .= " f.rowid as invoiceid, f.ref,";
@@ -762,7 +774,7 @@ if ($socid > 0)
 		$sql .= " ORDER BY dc DESC";
 		//$sql.= " UNION ";
 		// Discount linked to invoices
-		$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+		$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.vat_src_code,";
 		$sql2 .= " rc.datec as dc, rc.description, rc.fk_facture_line, rc.fk_facture,";
 		$sql2 .= " rc.fk_facture_source,";
 		$sql2 .= " u.login, u.rowid as user_id,";
@@ -881,7 +893,7 @@ if ($socid > 0)
 	    			{
 	    			    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 	    			}
-	    			print '<td class="right">'.vatrate($obj->tva_tx, true).'</td>';
+	    			print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 	    			print '<td class="right">'.price($obj->amount_ttc).'</td>';
 	    			if (!empty($conf->multicurrency->enabled))
 	    			{
@@ -920,7 +932,8 @@ if ($socid > 0)
 		}
 
 		// Discount linked to invoice lines
-		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
+		$sql = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.vat_src_code,";
+		$sql .= " rc.multicurrency_amount_ht, rc.multicurrency_amount_tva, rc.multicurrency_amount_ttc,";
 		$sql .= " rc.datec as dc, rc.description, rc.fk_invoice_supplier_line, rc.fk_invoice_supplier,";
 		$sql .= " rc.fk_invoice_supplier_source,";
 		$sql .= " u.login, u.rowid as user_id,";
@@ -939,7 +952,7 @@ if ($socid > 0)
 		$sql .= " ORDER BY dc DESC";
 		//$sql.= " UNION ";
 		// Discount linked to invoices
-		$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx,";
+		$sql2 = "SELECT rc.rowid, rc.amount_ht, rc.amount_tva, rc.amount_ttc, rc.tva_tx, rc.vat_src_code,";
 		$sql2 .= " rc.datec as dc, rc.description, rc.fk_invoice_supplier_line, rc.fk_invoice_supplier,";
 		$sql2 .= " rc.fk_invoice_supplier_source,";
 		$sql2 .= " u.login, u.rowid as user_id,";
@@ -1057,7 +1070,7 @@ if ($socid > 0)
 					{
 					    print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
-					print '<td class="right">'.vatrate($obj->tva_tx, true).'</td>';
+					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
 					print '<td class="right">'.price($obj->amount_ttc).'</td>';
 					if (!empty($conf->multicurrency->enabled))
 					{
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 148fa427fff..372e64e4e43 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -385,7 +385,7 @@ if (empty($reshook))
 								// Extrafields
 								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) // For avoid conflicts if trigger used
 								{
-									$lines[$i]->fetch_optionals($lines[$i]->rowid);
+									$lines[$i]->fetch_optionals();
 									$array_options = $lines[$i]->array_options;
 								}
 
@@ -1362,7 +1362,7 @@ if (empty($reshook))
 	            $originLine = new $lineClassName($db);
 	            if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
 	            {
-	                $originLine->fetch_optionals($lineId);
+	                $originLine->fetch_optionals();
 	                $desc = $originLine->desc;
 	                $pu_ht = $originLine->subprice;
 	                $qty = $originLine->qty;
@@ -1549,7 +1549,7 @@ if ($action == 'create' && $usercancreate)
 			$objectsrc->fetch_thirdparty();
 
 			// Replicate extrafields
-			$objectsrc->fetch_optionals($originid);
+			$objectsrc->fetch_optionals();
 			$object->array_options = $objectsrc->array_options;
 
 			$projectid = (!empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
@@ -1602,7 +1602,7 @@ if ($action == 'create' && $usercancreate)
 	}
 
 	print '<form name="crea_commande" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
 	print '<input type="hidden" name="remise_percent" value="'.$soc->remise_percent.'">';
@@ -1741,7 +1741,7 @@ if ($action == 'create' && $usercancreate)
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0);
+		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
 		print '</tr>';
@@ -2107,7 +2107,7 @@ if ($action == 'create' && $usercancreate)
 					$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 .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
 					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 					$morehtmlref .= '</form>';
 				} else {
@@ -2184,7 +2184,7 @@ if ($action == 'create' && $usercancreate)
 		print '</td><td>';
 		if ($action == 'editdate') {
 			print '<form name="setdate" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate">';
 			print $form->selectDate($object->date, 'order_', '', '', '', "setdate");
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
@@ -2205,7 +2205,7 @@ if ($action == 'create' && $usercancreate)
 		print '</td><td>';
 		if ($action == 'editdate_livraison') {
 			print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setdate_livraison">';
 			print $form->selectDate($object->date_livraison ? $object->date_livraison : - 1, 'liv_', '', '', '', "setdate_livraison");
 			print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
@@ -2499,7 +2499,7 @@ if ($action == 'create' && $usercancreate)
 		$result = $object->getLinesArray();
 
 		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#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="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 		<input type="hidden" name="mode" value="">
 		<input type="hidden" name="id" value="' . $object->id.'">';
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 57eb78df405..b2d1c09bd25 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -1381,7 +1381,7 @@ class Commande extends CommonOrder
 		$this->origin_id = $object->id;
 
 		// get extrafields from original line
-		$object->fetch_optionals($object->id);
+		$object->fetch_optionals();
 
 		$e = new ExtraFields($this->db);
 		$element_extrafields = $e->fetch_name_optionals_label($this->table_element);
@@ -3613,7 +3613,7 @@ class Commande extends CommonOrder
 		if ($status == self::STATUS_CANCELED) {
 		    $labelStatus = $langs->trans('StatusOrderCanceled');
 		    $labelStatusShort = $langs->trans('StatusOrderCanceledShort');
-		    $statusType = 'status5';
+		    $statusType = 'status9';
 		}
 		elseif ($status == self::STATUS_DRAFT) {
 		    $labelStatus = $langs->trans('StatusOrderDraft');
@@ -3628,7 +3628,7 @@ class Commande extends CommonOrder
 		elseif ($status == self::STATUS_SHIPMENTONPROCESS) {
 		    $labelStatus = $langs->trans('StatusOrderSentShort').$billedtext;
 		    $labelStatusShort = $langs->trans('StatusOrderSentShort').$billedtext;
-		    $statusType = 'status3';
+		    $statusType = 'status4';
 		}
 		elseif ($status == self::STATUS_CLOSED && (!$billed && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) {
 		    $labelStatus = $langs->trans('StatusOrderToBill');
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index a3b754e0979..4da1ea48fd6 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -162,13 +162,13 @@ if ($resql)
 		print '<tr class="oddeven">';
 		print '<td>';
 
-        $result='';
-        $link=$linkend='';
-        $link = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php', 1).'?socid='.$obj->rowid.'">';
-        $linkend='</a>';
-        $name=$obj->name;
-        $result.=($link.img_object($langs->trans("ShowCompany").': '.$name, 'company').$linkend);
-        $result.=$link.(dol_trunc($name, $maxlen)).$linkend;
+		$result='';
+		$link=$linkend='';
+		$link = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php', 1).'?socid='.$obj->rowid.'">';
+		$linkend='</a>';
+		$name=$obj->name;
+		$result.=($link.img_object($langs->trans("ShowCompany").': '.$name, 'company').$linkend);
+		$result.=$link.(dol_trunc($name, $maxlen)).$linkend;
 
 		print $result;
 		print '</td>';
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 072abe9625b..8e1fa07c17a 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -72,7 +72,6 @@ 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
 {
     // Search customer orders
-    $var = false;
     print '<form method="post" action="'.DOL_URL_ROOT.'/commande/list.php">';
     print '<input type="hidden" name="token" value="'.newToken().'">';
     print '<div class="div-table-responsive-no-min">';
@@ -88,7 +87,7 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
  * Statistics
  */
 
-$sql = "SELECT count(c.rowid), c.fk_statut";
+$sql = "SELECT count(c.rowid) as nb, c.fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."commande as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -117,7 +116,7 @@ if ($resql)
             //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
             {
                 if (! isset($vals[$row[1]])) $vals[$row[1]]=0;
-                $vals[$row[1].$bool]+=$row[0];
+                $vals[$row[1]]+=$row[0];
                 $totalinprocess+=$row[0];
             }
             $total+=$row[0];
@@ -125,13 +124,32 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
+
+    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder nohover centpercent">';
     print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</th></tr>'."\n";
     $listofstatus=array(0,1,2,3,-1);
     foreach ($listofstatus as $status)
     {
-    	$dataseries[]=array($commandestatic->LibStatut($status, $bool, 1), (isset($vals[$status.$bool])?(int) $vals[$status.$bool]:0));
+    	$dataseries[] = array($commandestatic->LibStatut($status, 0, 1, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+    	if ($status == Commande::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+    	if ($status == Commande::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+    	if ($status == Commande::STATUS_SHIPMENTONPROCESS) $colorseries[$status] = $badgeStatus4;
+    	if ($status == Commande::STATUS_CLOSED && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) $colorseries[$status] = $badgeStatus6;
+    	if ($status == Commande::STATUS_CLOSED && (!empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))) $colorseries[$status] = $badgeStatus6;
+    	if ($status == Commande::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+
+    	if (empty($conf->use_javascript_ajax))
+    	{
+    		print '<tr class="oddeven">';
+    		print '<td>'.$commandestatic->LibStatut($status, 0, 0, 1).'</td>';
+    		print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';
+    		print $commandestatic->LibStatut($status, 0, 3, 1);
+    		print '</a></td>';
+    		print "</tr>\n";
+    	}
     }
     if ($conf->use_javascript_ajax)
     {
@@ -140,6 +158,7 @@ if ($resql)
         include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
         $dolgraph = new DolGraph();
         $dolgraph->SetData($dataseries);
+        $dolgraph->SetDataColor(array_values($colorseries));
         $dolgraph->setShowLegend(2);
         $dolgraph->setShowPercent(1);
         $dolgraph->SetType(array('pie'));
@@ -149,19 +168,6 @@ if ($resql)
 
         print '</td></tr>';
     }
-    else
-    {
-	    foreach ($listofstatus as $status)
-	    {
-        	print '<tr class="oddeven">';
-            print '<td>'.$commandestatic->LibStatut($status, $bool, 0).'</td>';
-            print '<td class="right"><a href="list.php?viewstatut='.$status.'">'.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' ';
-            print $commandestatic->LibStatut($status, $bool, 3);
-            print '</a>';
-            print '</td>';
-            print "</tr>\n";
-        }
-    }
     //if ($totalinprocess != $total)
     print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td class="right">'.$total.'</td></tr>';
     print "</table></div><br>";
@@ -202,7 +208,6 @@ if (!empty($conf->commande->enabled))
 		if ($num)
 		{
 			$i = 0;
-			$var = true;
 			while ($i < $num)
 			{
 				$obj = $db->fetch_object($resql);
@@ -241,7 +246,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 $max = 5;
 
 /*
- * Last modified orders
+ * Lattest modified orders
  */
 
 $sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";
@@ -272,7 +277,6 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-		$var = true;
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -311,7 +315,7 @@ if ($resql)
             print $companystatic->getNomUrl(1, 'company', 16);
             print '</td>';
 			print '<td>'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
-			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 5).'</td>';
+			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
 			print '</tr>';
 			$i++;
 		}
@@ -320,13 +324,14 @@ if ($resql)
 }
 else dol_print_error($db);
 
+$max = 10;
 
 /*
  * Orders to process
  */
 if (!empty($conf->commande->enabled))
 {
-	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
+	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
     $sql .= ", s.client";
     $sql .= ", s.code_client";
     $sql .= ", s.canvas";
@@ -335,7 +340,7 @@ if (!empty($conf->commande->enabled))
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity('commande').")";
-	$sql .= " AND c.fk_statut = 1";
+	$sql .= " AND c.fk_statut = ".Commande::STATUS_VALIDATED;
 	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	$sql .= " ORDER BY c.rowid DESC";
@@ -344,16 +349,16 @@ if (!empty($conf->commande->enabled))
 	if ($resql)
 	{
 		$num = $db->num_rows($resql);
+
         print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=1"><span class="badge">'.$num.'</span></a></th></tr>';
+		print '<th colspan="4">'.$langs->trans("OrdersToProcess").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut='.Commande::STATUS_VALIDATED.'"><span class="badge">'.$num.'</span></a></th></tr>';
 
 		if ($num)
 		{
 			$i = 0;
-			$var = true;
-			while ($i < $num)
+			while ($i < $num && $i < $max)
 			{
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
@@ -390,11 +395,16 @@ if (!empty($conf->commande->enabled))
                 print $companystatic->getNomUrl(1, 'company', 24);
                 print '</td>';
 
-				print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 5).'</td>';
+                print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";
+
+				print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
 
 				print '</tr>';
 				$i++;
 			}
+			if ($i < $num) {
+				print '<tr><td><span class="opacitymedium">'.$langs->trans("More").'...</span></td><td></td><td></td><td></td></tr>';
+			}
 		}
 
 		print "</table></div><br>";
@@ -403,11 +413,11 @@ if (!empty($conf->commande->enabled))
 }
 
 /*
- * Orders thar are in a shipping process
+ * Orders that are in process
  */
 if (!empty($conf->commande->enabled))
 {
-	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
+	$sql = "SELECT c.rowid, c.entity, c.ref, c.fk_statut, c.facture, c.date_commande as date, s.nom as name, s.rowid as socid";
     $sql .= ", s.client";
     $sql .= ", s.code_client";
     $sql .= ", s.canvas";
@@ -416,7 +426,7 @@ if (!empty($conf->commande->enabled))
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	$sql .= " WHERE c.fk_soc = s.rowid";
 	$sql .= " AND c.entity IN (".getEntity('commande').")";
-	$sql .= " AND c.fk_statut = 2 ";
+	$sql .= " AND c.fk_statut = ".Commande::STATUS_ACCEPTED;
 	if ($socid) $sql .= " AND c.fk_soc = ".$socid;
 	if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 	$sql .= " ORDER BY c.rowid DESC";
@@ -429,13 +439,12 @@ if (!empty($conf->commande->enabled))
         print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut=2"><span class="badge">'.$num.'</span></a></th></tr>';
+		print '<th colspan="4">'.$langs->trans("OnProcessOrders").' <a href="'.DOL_URL_ROOT.'/commande/list.php?viewstatut='.Commande::STATUS_ACCEPTED.'"><span class="badge">'.$num.'</span></a></th></tr>';
 
 		if ($num)
 		{
 			$i = 0;
-			$var = true;
-			while ($i < $num)
+			while ($i < $num && $i < $max)
 			{
 				$obj = $db->fetch_object($resql);
 				print '<tr class="oddeven">';
@@ -472,11 +481,16 @@ if (!empty($conf->commande->enabled))
 				print $companystatic->getNomUrl(1, 'company');
 				print '</td>';
 
-				print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 5).'</td>';
+				print '<td class="right">'.dol_print_date($db->jdate($obj->date), 'day').'</td>'."\n";
+
+				print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, $obj->facture, 3).'</td>';
 
 				print '</tr>';
 				$i++;
 			}
+			if ($i < $num) {
+				print '<tr><td><span class="opacitymedium">'.$langs->trans("More").'...</span></td><td></td><td></td><td></td></tr>';
+			}
 		}
 		print "</table></div><br>";
 	}
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index a473ccbb993..764b31ad0f6 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -287,7 +287,7 @@ if (($action == 'create' || $action == 'add') && !$error)
 
 										// Extrafields
 										if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-											$lines[$i]->fetch_optionals($lines[$i]->rowid);
+											$lines[$i]->fetch_optionals();
 											$array_options = $lines[$i]->array_options;
 										}
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 57d81c625fe..8dd3eca5e33 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -363,7 +363,7 @@ if ($action == "create" || $action == "start" || $action == 'close')
 		print load_fiche_titre($langs->trans("CashControl")." - ".$langs->trans("New"), '', 'cash-register');
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	    print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+	    print '<input type="hidden" name="token" value="' . newToken() . '">';
 	    if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
 	    {
 		    print '<input type="hidden" name="action" value="add">';
@@ -680,7 +680,7 @@ if (empty($action) || $action == "view" || $action == "close")
 			print '<center><iframe src="report.php?id='.$id.'" width="60%" height="800"></iframe></center>';
 	    } else {
 	    	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'" name="formclose">';
-	    	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+	    	print '<input type="hidden" name="token" value="' . newToken() . '">';
 	    	if ($action == 'start' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '' && GETPOST('posnumber', 'int') != '-1')
 	    	{
 	    		print '<input type="hidden" name="action" value="add">';
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index dd295fa3112..26eee81375f 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1680,7 +1680,7 @@ else
 
 		// Lines
 		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#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="' . (($action != 'editline') ? 'addline' : 'updateline').'">
         	<input type="hidden" name="mode" value="">
         	<input type="hidden" name="id" value="' . $object->id.'">
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 868ccc006d8..55b16368469 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2006  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
- * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005       Marc Barilley / Ocebo   <marc@ocebo.com>
  * Copyright (C) 2005-2015  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2006       Andre Cianfarani        <acianfa@free.fr>
@@ -302,10 +302,12 @@ if (empty($reshook))
 			$array_of_total_ht_per_vat_rate = array();
 			$array_of_total_ht_devise_per_vat_rate = array();
 			foreach ($object->lines as $line) {
-				if (empty($array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code])) $array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] = 0;
-				if (empty($array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code])) $array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] = 0;
-				$array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] += $line->total_ht;
-				$array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$line->vat_src_code] += $line->multicurrency_total_ht;
+				//$vat_src_code_for_line = $line->vat_src_code;		// TODO We chek sign of total per vat without taking into account the vat code because for the moment the vat code is lost/unknown when we add a down payment.
+				$vat_src_code_for_line = '';
+				if (empty($array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line])) $array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] = 0;
+				if (empty($array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line])) $array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] = 0;
+				$array_of_total_ht_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] += $line->total_ht;
+				$array_of_total_ht_devise_per_vat_rate[$line->tva_tx.'_'.$vat_src_code_for_line] += $line->multicurrency_total_ht;
 			}
 
 			//var_dump($array_of_total_ht_per_vat_rate);exit;
@@ -485,10 +487,10 @@ if (empty($reshook))
 		// POST[remise_id] or POST[remise_id_for_payment]
 
 		// We use the credit to reduce amount of invoice
-		if (!empty($_POST["remise_id"])) {
+		if (GETPOST("remise_id", 'int') > 0) {
 			$ret = $object->fetch($id);
 			if ($ret > 0) {
-				$result = $object->insert_discount($_POST["remise_id"]);
+				$result = $object->insert_discount(GETPOST("remise_id", 'int'));
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
@@ -497,11 +499,11 @@ if (empty($reshook))
 			}
 		}
 		// We use the credit to reduce remain to pay
-		if (!empty($_POST["remise_id_for_payment"]))
+		if (GETPOST("remise_id_for_payment", 'int') > 0)
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 			$discount = new DiscountAbsolute($db);
-			$discount->fetch($_POST["remise_id_for_payment"]);
+			$discount->fetch(GETPOST("remise_id_for_payment", 'int'));
 
 			//var_dump($object->getRemainToPay(0));
 			//var_dump($discount->amount_ttc);exit;
@@ -809,14 +811,16 @@ if (empty($reshook))
 			$i = 0;
 			foreach ($object->lines as $line)
 			{
-				if ($line->product_type < 9 && $line->total_ht != 0) // Remove lines with product_type greater than or equal to 9
-				{ 	// no need to create discount if amount is null
-					$amount_ht[$line->tva_tx] += $line->total_ht;
-					$amount_tva[$line->tva_tx] += $line->total_tva;
-					$amount_ttc[$line->tva_tx] += $line->total_ttc;
-					$multicurrency_amount_ht[$line->tva_tx] += $line->multicurrency_total_ht;
-					$multicurrency_amount_tva[$line->tva_tx] += $line->multicurrency_total_tva;
-					$multicurrency_amount_ttc[$line->tva_tx] += $line->multicurrency_total_ttc;
+				if ($line->product_type < 9 && $line->total_ht != 0) // Remove lines with product_type greater than or equal to 9 and no need to create discount if amount is null
+				{
+					$keyforvatrate = $line->tva_tx.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : '');
+
+					$amount_ht[$keyforvatrate] += $line->total_ht;
+					$amount_tva[$keyforvatrate] += $line->total_tva;
+					$amount_ttc[$keyforvatrate] += $line->total_ttc;
+					$multicurrency_amount_ht[$keyforvatrate] += $line->multicurrency_total_ht;
+					$multicurrency_amount_tva[$keyforvatrate] += $line->multicurrency_total_tva;
+					$multicurrency_amount_ttc[$keyforvatrate] += $line->multicurrency_total_ttc;
 					$i++;
 				}
 			}
@@ -830,9 +834,9 @@ if (empty($reshook))
 						$amount_ht[$vatrate] = price2num($amount_ht[$vatrate] * $ratio, 'MU');
 						$amount_tva[$vatrate] = price2num($amount_tva[$vatrate] * $ratio, 'MU');
 						$amount_ttc[$vatrate] = price2num($amount_ttc[$vatrate] * $ratio, 'MU');
-						$multicurrency_amount_ht[$line->tva_tx] = price2num($multicurrency_amount_ht[$vatrate] * $ratio, 'MU');
-						$multicurrency_amount_tva[$line->tva_tx] = price2num($multicurrency_amount_tva[$vatrate] * $ratio, 'MU');
-						$multicurrency_amount_ttc[$line->tva_tx] = price2num($multicurrency_amount_ttc[$vatrate] * $ratio, 'MU');
+						$multicurrency_amount_ht[$vatrate] = price2num($multicurrency_amount_ht[$vatrate] * $ratio, 'MU');
+						$multicurrency_amount_tva[$vatrate] = price2num($multicurrency_amount_tva[$vatrate] * $ratio, 'MU');
+						$multicurrency_amount_ttc[$vatrate] = price2num($multicurrency_amount_ttc[$vatrate] * $ratio, 'MU');
 					}
 				}
 			}
@@ -887,6 +891,7 @@ if (empty($reshook))
 				$discount->amount_ht = $discount->amount_ttc = $total_paiements + $total_creditnote_and_deposit - $object->total_ttc;
 				$discount->amount_tva = 0;
 				$discount->tva_tx = 0;
+				$discount->vat_src_code = '';
 
 				$result = $discount->create($user);
 				if ($result < 0)
@@ -904,7 +909,18 @@ if (empty($reshook))
 					$discount->multicurrency_amount_ht = abs($multicurrency_amount_ht[$tva_tx]);
 					$discount->multicurrency_amount_tva = abs($multicurrency_amount_tva[$tva_tx]);
 					$discount->multicurrency_amount_ttc = abs($multicurrency_amount_ttc[$tva_tx]);
+
+					// Clean vat code
+					$reg = array();
+					$vat_src_code = '';
+					if (preg_match('/\((.*)\)/', $tva_tx, $reg))
+					{
+						$vat_src_code = $reg[1];
+						$tva_tx = preg_replace('/\s*\(.*\)/', '', $tva_tx); // Remove code into vatrate.
+					}
+
 					$discount->tva_tx = abs($tva_tx);
+					$discount->vat_src_code =$vat_src_code;
 
 					$result = $discount->create($user);
 					if ($result < 0)
@@ -1592,7 +1608,7 @@ if (empty($reshook))
 
 										// Extrafields
 										if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-											$lines[$i]->fetch_optionals($lines[$i]->rowid);
+											$lines[$i]->fetch_optionals();
 											$array_options = $lines[$i]->array_options;
 										}
 
@@ -1733,7 +1749,7 @@ if (empty($reshook))
 						$line->origin = $object->origin;
 						$line->origin_id = $line->id;
 						$line->fk_prev_id = $line->id;
-						$line->fetch_optionals($line->id);
+						$line->fetch_optionals();
 						$line->situation_percent = $line->get_prev_progress($object->id); // get good progress including credit note
 
 						// Si fk_remise_except defini on vérifie si la réduction à déjà été appliquée
@@ -2539,7 +2555,7 @@ if (empty($reshook))
                 $originLine = new $lineClassName($db);
                 if (intval($fromElementid) > 0 && $originLine->fetch($lineId) > 0)
                 {
-                    $originLine->fetch_optionals($lineId);
+                    $originLine->fetch_optionals();
                     $desc = $originLine->desc;
                     $pu_ht = $originLine->subprice;
                     $qty = $originLine->qty;
@@ -2794,7 +2810,7 @@ if ($action == 'create')
 				$remise_absolue 	= (!empty($expesrc->remise_absolue) ? $expesrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 
 				//Replicate extrafields
-				$expesrc->fetch_optionals($expeoriginid);
+				$expesrc->fetch_optionals();
 				$object->array_options = $expesrc->array_options;
 			}
 			else
@@ -2812,7 +2828,7 @@ if ($action == 'create')
 				}
 
 				// Replicate extrafields
-				$objectsrc->fetch_optionals($originid);
+				$objectsrc->fetch_optionals();
 				$object->array_options = $objectsrc->array_options;
 			}
 		}
@@ -2854,7 +2870,7 @@ if ($action == 'create')
 	}
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($soc->id > 0) print '<input type="hidden" name="socid" value="'.$soc->id.'">'."\n";
 	print '<input name="ref" type="hidden" value="provisoire">';
@@ -3397,7 +3413,7 @@ if ($action == 'create')
 	{
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
-		$numprojet = $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1);
+		$numprojet = $formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id.($fac_rec ? '&fac_rec='.$fac_rec : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td></tr>';
 	}
@@ -4459,7 +4475,7 @@ elseif ($id > 0 || !empty($ref))
 		print '</td><td>';
 		if ($action == 'editrevenuestamp') {
 			print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-			print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="action" value="setrevenuestamp">';
 			print '<input type="hidden" name="revenuestamp" id="revenuestamp_val" value="'.price2num($object->revenuestamp).'">';
 			print $formother->select_revenue_stamp('', 'revenuestamp_type', $mysoc->country_code);
@@ -4963,7 +4979,7 @@ elseif ($id > 0 || !empty($ref))
 	}
 
 	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#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="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
 	<input type="hidden" name="id" value="' . $object->id.'">
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index fdffc320880..524d553effd 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -677,7 +677,7 @@ class FactureRec extends CommonInvoice
 				$line->price            = $objp->price;
 				$line->remise           = $objp->remise;
 
-				$line->fetch_optionals($line->id);
+				$line->fetch_optionals();
 
 				// Multicurrency
 				$line->fk_multicurrency = $objp->fk_multicurrency;
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index 4658af376f1..606d84b256b 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -1317,7 +1317,7 @@ class Facture extends CommonInvoice
 		$this->origin_id = $object->id;
 
         // get extrafields from original line
-		$object->fetch_optionals($object->id);
+		$object->fetch_optionals();
 		foreach ($object->array_options as $options_key => $value)
 			$this->array_options[$options_key] = $value;
 
@@ -1652,8 +1652,8 @@ class Facture extends CommonInvoice
 		$this->lines = array();
 
 		$sql = 'SELECT l.rowid, l.fk_facture, l.fk_product, l.fk_parent_line, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
-		$sql .= ' l.situation_percent, l.fk_prev_id,';
 		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise_percent, l.fk_remise_except, l.subprice,';
+		$sql .= ' l.situation_percent, l.fk_prev_id,';
 		$sql .= ' l.rang, l.special_code,';
 		$sql .= ' l.date_start as date_start, l.date_end as date_end,';
 		$sql .= ' l.info_bits, l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc, l.fk_code_ventilation, l.fk_product_fournisseur_price as fk_fournprice, l.buy_price_ht as pa_ht,';
@@ -3076,6 +3076,7 @@ class Facture extends CommonInvoice
 			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
 
 			// Clean vat code
+			$reg = array();
 			$vat_src_code = '';
 			if (preg_match('/\((.*)\)/', $txtva, $reg))
 			{
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index c9a77e5cc26..4c7e0714caa 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -348,7 +348,7 @@ if (!empty($conf->facture->enabled) && $user->rights->facture->lire)
 	$sql .= " GROUP BY f.rowid, f.ref, f.fk_statut, f.type, f.total, f.tva, f.total_ttc, f.paye, f.tms, f.date_lim_reglement,";
 	$sql .= " s.nom, s.rowid, s.code_client, s.code_compta, s.email,";
 	$sql .= " cc.rowid, cc.code";
-	$sql .= " ORDER BY f.tms DESC ";
+	$sql .= " ORDER BY f.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
 	$resql = $db->query($sql);
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 55bf5e1f022..fdc1d622e90 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -54,15 +54,15 @@ $sql.= " AND pb.entity = ".$conf->entity;
 $resql=$db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    if ( $num > 0 )
-    {
-        $row = $db->fetch_row($resql);
-        $total = $row[0];
-        $nbtotal = $row[1];
-    }
+	if ( $num > 0 )
+	{
+		$row = $db->fetch_row($resql);
+		$total = $row[0];
+		$nbtotal = $row[1];
+	}
 }
 
 
@@ -150,15 +150,15 @@ $sql.= " AND pl.statut = 3";
 $resql=$db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    if ( $num > 0 )
-    {
-        $row = $db->fetch_row($resql);
-        $total = $row[0];
-        $nbtotal = $row[1];
-    }
+	if ( $num > 0 )
+	{
+		$row = $db->fetch_row($resql);
+		$total = $row[0];
+		$nbtotal = $row[1];
+	}
 }
 
 /*
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index e449f907bc8..7806e3e4cc1 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -27,8 +27,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 if (! empty($conf->projet->enabled))
 {
-    include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
-    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
@@ -51,10 +51,10 @@ $object = new ChargeSociales($db);
 
 if ($action == 'setlib' && $user->rights->tax->charges->creer)
 {
-    $object->fetch($id);
-    $result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
-    if ($result < 0)
-        setEventMessages($object->error, $object->errors, 'errors');
+	$object->fetch($id);
+	$result = $object->setValueFrom('libelle', GETPOST('lib'), '', '', 'text', '', $user, 'TAX_MODIFY');
+	if ($result < 0)
+		setEventMessages($object->error, $object->errors, 'errors');
 }
 
 
@@ -84,17 +84,17 @@ $morehtmlref.=$form->editfieldval("Label", 'lib', $object->label, $object, $user
 // Project
 if (! empty($conf->projet->enabled))
 {
-    $langs->load("projects");
-    $morehtmlref.='<br>'.$langs->trans('Project') . ' : ';
-    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 (! 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>';
 
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index 5f6bea09a3d..7696e3365d2 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -80,9 +80,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>";
 }
 
 
@@ -95,9 +95,9 @@ if ($action != 'create' && $action != 'edit')
 if ($action == 'create')
 {
 	print '<br><div name="topofform" id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -108,9 +108,9 @@ if ($action == 'create')
 if ($action == 'edit' && ! empty($attrname))
 {
 	print '<div name="topofform"></div><br>';
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index 3a8340dfecc..a78669bec22 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -80,9 +80,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>";
 }
 
 
@@ -97,7 +97,7 @@ 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';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -107,10 +107,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 4e0e5cb5865..9bcae25badd 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -317,7 +317,7 @@ if (empty($reshook))
 								$array_options = array();
 								// For avoid conflicts if trigger used
 								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-									$lines[$i]->fetch_optionals($lines[$i]->rowid);
+									$lines[$i]->fetch_optionals();
 									$array_options = $lines[$i]->array_options;
 								}
 
@@ -1128,12 +1128,12 @@ if ($action == 'create')
 
 			$classname = ucfirst($subelement);
 			$objectsrc = new $classname($db);
-			$objectsrc->fetch(GETPOST('originid'));
+			$objectsrc->fetch($originid);
 			if (empty($objectsrc->lines) && method_exists($objectsrc, 'fetch_lines'))  $objectsrc->fetch_lines();
 			$objectsrc->fetch_thirdparty();
 
 			// Replicate extrafields
-			$objectsrc->fetch_optionals($originid);
+			$objectsrc->fetch_optionals();
 			$object->array_options = $objectsrc->array_options;
 
 			$projectid = (!empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
@@ -1703,7 +1703,8 @@ else
 					// Display lines extrafields
 					if (is_array($extralabelslines) && count($extralabelslines) > 0) {
 						$line = new ContratLigne($db);
-						$line->fetch_optionals($objp->rowid);
+						$line->id = $objp->rowid;
+						$line->fetch_optionals();
 						print $line->showOptionals($extrafields, 'view', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', 1);
 					}
 				}
@@ -1793,7 +1794,8 @@ else
 
 					if (is_array($extralabelslines) && count($extralabelslines) > 0) {
 						$line = new ContratLigne($db);
-						$line->fetch_optionals($objp->rowid);
+						$line->id = $objp->rowid;
+						$line->fetch_optionals();
 						print $line->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), '', '', 1);
 					}
 				}
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0aee2ed876d..58bd029f8de 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -2785,7 +2785,7 @@ class ContratLigne extends CommonObjectLine
 		elseif ($status == self::STATUS_CLOSED) { $labelStatus = $langs->trans("ServiceStatusClosed"); $labelStatusShort = $langs->trans("ServiceStatusClosed"); }
 
 		$statusType = 'status'.$status;
-		if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status3';
+		if ($status == self::STATUS_OPEN && $expired == 1) $statusType = 'status1';
 		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
 
 		$params = array(); $reg = array();
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 1061d47a888..3c306453c00 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -109,7 +109,7 @@ $dataseries = array();
 $vals = array();
 
 // Search by status (except expired)
-$sql = "SELECT count(cd.rowid), cd.statut";
+$sql = "SELECT count(cd.rowid) as nb, cd.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -126,16 +126,16 @@ if ($resql)
 	$i = 0;
 	while ($i < $num)
 	{
-		$row = $db->fetch_row($resql);
-		if ($row)
+		$obj = $db->fetch_object($resql);
+		if ($obj)
 		{
-    		$nb[$row[1]] = $row[0];
-            if ($row[1] != 5)
+			$nb[$obj->status] = $obj->nb;
+			if ($obj->status != 5)
             {
-                $vals[$row[1]] = $row[0];
-                $totalinprocess += $row[0];
+            	$vals[$obj->status] = $obj->nb;
+            	$totalinprocess += $obj->nb;
             }
-            $total += $row[0];
+            $total += $obj->nb;
 		}
 		$i++;
 	}
@@ -146,7 +146,7 @@ else
 	dol_print_error($db);
 }
 // Search by status (only expired)
-$sql = "SELECT count(cd.rowid), cd.statut";
+$sql = "SELECT count(cd.rowid) as nb, cd.statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."contratdet as cd, ".MAIN_DB_PREFIX."contrat as c";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -165,16 +165,16 @@ if ($resql)
     $i = 0;
     while ($i < $num)
     {
-        $row = $db->fetch_row($resql);
-        if ($row)
+        $obj = $db->fetch_object($resql);
+        if ($obj)
         {
-            $nb[$row[1].true] = $row[0];
-            if ($row[1] != 5)
+        	$nb[$obj->status.true] = $obj->nb;
+            if ($obj->status != 5)
             {
-                $vals[$row[1]] = $row[0];
-                $totalinprocess += $row[0];
+            	$vals[$obj->status.true] = $obj->nb;
+            	$totalinprocess += $obj->nb;
             }
-            $total += $row[0];
+            $total += $obj->nb;
         }
         $i++;
     }
@@ -185,6 +185,10 @@ else
 	dol_print_error($db);
 }
 
+$colorseries = array();
+
+include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder nohover centpercent">';
 print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</th></tr>'."\n";
@@ -192,6 +196,11 @@ $listofstatus = array(0, 4, 4, 5); $bool = false;
 foreach ($listofstatus as $status)
 {
     $dataseries[] = array($staticcontratligne->LibStatut($status, 1, ($bool ? 1 : 0)), (isset($nb[$status.$bool]) ? (int) $nb[$status.$bool] : 0));
+    if ($status == ContratLigne::STATUS_INITIAL) $colorseries[$status.$bool] = '-'.$badgeStatus0;
+    if ($status == ContratLigne::STATUS_OPEN && !$bool) $colorseries[$status.$bool] = $badgeStatus4;
+    if ($status == ContratLigne::STATUS_OPEN && $bool) $colorseries[$status.$bool] = $badgeStatus1;
+    if ($status == ContratLigne::STATUS_CLOSED) $colorseries[$status.$bool] = $badgeStatus6;
+
     if (empty($conf->use_javascript_ajax))
     {
         print '<tr class="oddeven">';
@@ -209,6 +218,7 @@ if (!empty($conf->use_javascript_ajax))
     include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
     $dolgraph = new DolGraph();
     $dolgraph->SetData($dataseries);
+    $dolgraph->SetDataColor(array_values($colorseries));
     $dolgraph->setShowLegend(2);
     $dolgraph->setShowPercent(1);
     $dolgraph->SetType(array('pie'));
diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index 9fca4502dcf..ca5f05f5f4d 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -32,9 +32,9 @@ $addlinkid = GETPOST('idtolinkto', 'int');
 // Link invoice to order
 if ($action == 'addlink' && ! empty($permissiondellink) && ! GETPOST('cancel', 'alpha') && $id > 0 && $addlinkid > 0)
 {
-    $object->fetch($id);
-    $object->fetch_thirdparty();
-    $result = $object->add_object_linked(GETPOST('addlink', 'alpha'), $addlinkid);
+	$object->fetch($id);
+	$object->fetch_thirdparty();
+	$result = $object->add_object_linked(GETPOST('addlink', 'alpha'), $addlinkid);
 }
 
 // Delete link
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 17e063244df..419296b7341 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -744,7 +744,7 @@ if ($massaction == 'confirm_createbills')   // Create bills from orders
 
 						// Extrafields
 						if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-							$lines[$i]->fetch_optionals($lines[$i]->rowid);
+							$lines[$i]->fetch_optionals();
 							$array_options = $lines[$i]->array_options;
 						}
 
diff --git a/htdocs/core/actions_printing.inc.php b/htdocs/core/actions_printing.inc.php
index fc0f25a1297..0671e998684 100644
--- a/htdocs/core/actions_printing.inc.php
+++ b/htdocs/core/actions_printing.inc.php
@@ -29,63 +29,63 @@
 
 // Print file
 if ($action == 'print_file' && $user->rights->printing->read) {
-    $langs->load("printing");
-    require_once DOL_DOCUMENT_ROOT . '/core/modules/printing/modules_printing.php';
-    $objectprint = new PrintingDriver($db);
-    $list = $objectprint->listDrivers($db, 10);
-    if (! empty($list)) {
-        $errorprint=0;
-        $printerfound=0;
-        foreach ($list as $driver) {
-            require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-            $langs->load($driver);
-            $classname = 'printing_'.$driver;
-            $printer = new $classname($db);
-            //print '<pre>'.print_r($printer, true).'</pre>';
+	$langs->load("printing");
+	require_once DOL_DOCUMENT_ROOT . '/core/modules/printing/modules_printing.php';
+	$objectprint = new PrintingDriver($db);
+	$list = $objectprint->listDrivers($db, 10);
+	if (! empty($list)) {
+		$errorprint=0;
+		$printerfound=0;
+		foreach ($list as $driver) {
+			require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
+			$langs->load($driver);
+			$classname = 'printing_'.$driver;
+			$printer = new $classname($db);
+			//print '<pre>'.print_r($printer, true).'</pre>';
 
-            if (! empty($conf->global->{$printer->active}))
-            {
-                $printerfound++;
+			if (! empty($conf->global->{$printer->active}))
+			{
+				$printerfound++;
 
-                $subdir='';
-                $module = GETPOST('printer', 'alpha');
-                switch ($module )
-                {
-                    case 'livraison' :
-                        $subdir = 'receipt';
-                        $module = 'expedition';
-                        break;
-                    case 'expedition' :
-                        $subdir = 'sending';
-                        break;
-                    case 'commande_fournisseur' :
-                        $module = 'fournisseur';
-                        $subdir = 'commande';
-                        break;
-                }
-                try {
-                    $ret = $printer->printFile(GETPOST('file', 'alpha'), $module, $subdir);
-                    if ($ret > 0) {
-                        //print '<pre>'.print_r($printer->errors, true).'</pre>';
-                        setEventMessages($printer->error, $printer->errors, 'errors');
-                    }
-                    if ($ret==0)
-                    {
-                        //print '<pre>'.print_r($printer->errors, true).'</pre>';
-                        setEventMessages($printer->error, $printer->errors);
-                        setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
-                    }
-                }
-                catch(Exception $e)
-                {
-                    $ret = 1;
-                    setEventMessages($e->getMessage(), null, 'errors');
-                }
-            }
-        }
-        if ($printerfound==0) setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
-    } else {
-        setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
-    }
-    $action = '';
+				$subdir='';
+				$module = GETPOST('printer', 'alpha');
+				switch ($module )
+				{
+					case 'livraison' :
+						$subdir = 'receipt';
+						$module = 'expedition';
+						break;
+					case 'expedition' :
+						$subdir = 'sending';
+						break;
+					case 'commande_fournisseur' :
+						$module = 'fournisseur';
+						$subdir = 'commande';
+						break;
+				}
+				try {
+					$ret = $printer->printFile(GETPOST('file', 'alpha'), $module, $subdir);
+					if ($ret > 0) {
+						//print '<pre>'.print_r($printer->errors, true).'</pre>';
+						setEventMessages($printer->error, $printer->errors, 'errors');
+					}
+					if ($ret==0)
+					{
+						//print '<pre>'.print_r($printer->errors, true).'</pre>';
+						setEventMessages($printer->error, $printer->errors);
+						setEventMessages($langs->transnoentitiesnoconv("FileWasSentToPrinter", basename(GETPOST('file', 'alpha'))).' '.$langs->transnoentitiesnoconv("ViaModule").' '.$printer->name, null);
+					}
+				}
+				catch(Exception $e)
+				{
+					$ret = 1;
+					setEventMessages($e->getMessage(), null, 'errors');
+				}
+			}
+		}
+		if ($printerfound==0) setEventMessages($langs->trans("NoActivePrintingModuleFound", $langs->transnoentities("Module64000Name")), null, 'warnings');
+	} else {
+		setEventMessages($langs->trans("NoModuleFound"), null, 'warnings');
+	}
+	$action = '';
 }
diff --git a/htdocs/core/actions_setnotes.inc.php b/htdocs/core/actions_setnotes.inc.php
index 425204e00a4..8c8f23f9b0e 100644
--- a/htdocs/core/actions_setnotes.inc.php
+++ b/htdocs/core/actions_setnotes.inc.php
@@ -60,8 +60,8 @@ if ($action == 'setnote_public' && ! empty($permissionnote) && ! GETPOST('cancel
 		}
 	}
 } elseif ($action == 'setnote_private' && ! empty($permissionnote) && ! GETPOST('cancel', 'alpha')) {
-    // 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');
+	// 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', 'none'), ENT_QUOTES), '_private');
 	if ($result < 0) setEventMessages($object->error, $object->errors, 'errors');
diff --git a/htdocs/core/ajax/bankconciliate.php b/htdocs/core/ajax/bankconciliate.php
index 690ebc80f85..f3e6c379392 100644
--- a/htdocs/core/ajax/bankconciliate.php
+++ b/htdocs/core/ajax/bankconciliate.php
@@ -51,46 +51,46 @@ if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->datev_next(GETPOST('rowid', 'int'));
-    $al->fetch(GETPOST('rowid', 'int'));
+	$al->datev_next(GETPOST('rowid', 'int'));
+	$al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
+	print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
 
-    exit;
+	exit;
 }
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'dvprev')
 {
 	// Decrease date
 	$al =new AccountLine($db);
-    $al->datev_previous(GETPOST('rowid', 'int'));
-    $al->fetch(GETPOST('rowid', 'int'));
+	$al->datev_previous(GETPOST('rowid', 'int'));
+	$al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
+	print '<span>'.dol_print_date($db->jdate($al->datev), "day").'</span>';
 
-    exit;
+	exit;
 }
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'donext')
 {
 	// Increase date
 	$al = new AccountLine($db);
-    $al->dateo_next(GETPOST('rowid', 'int'));
-    $al->fetch(GETPOST('rowid', 'int'));
+	$al->dateo_next(GETPOST('rowid', 'int'));
+	$al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
+	print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
 
-    exit;
+	exit;
 }
 
 if (($user->rights->banque->modifier || $user->rights->banque->consolidate) && $action == 'doprev')
 {
 	// Decrease date
 	$al =new AccountLine($db);
-    $al->dateo_previous(GETPOST('rowid', 'int'));
-    $al->fetch(GETPOST('rowid', 'int'));
+	$al->dateo_previous(GETPOST('rowid', 'int'));
+	$al->fetch(GETPOST('rowid', 'int'));
 
-    print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
+	print '<span>'.dol_print_date($db->jdate($al->dateo), "day").'</span>';
 
-    exit;
+	exit;
 }
diff --git a/htdocs/core/ajax/fileupload.php b/htdocs/core/ajax/fileupload.php
index 5a3b18da55e..4e2252cee56 100644
--- a/htdocs/core/ajax/fileupload.php
+++ b/htdocs/core/ajax/fileupload.php
@@ -53,23 +53,23 @@ header('Access-Control-Allow-Headers: X-File-Name, X-File-Type, X-File-Size');
 switch ($_SERVER['REQUEST_METHOD']) {
 	case 'OPTIONS':
 		break;
-    case 'HEAD':
-    case 'GET':
-        $upload_handler->get();
-        break;
-    case 'POST':
-    	if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
-            $upload_handler->delete();
-        } else {
-            $upload_handler->post();
-        }
-        break;
-    case 'DELETE':
-        $upload_handler->delete();
-        break;
-    default:
-        header('HTTP/1.0 405 Method Not Allowed');
-        exit;
+	case 'HEAD':
+	case 'GET':
+		$upload_handler->get();
+		break;
+	case 'POST':
+		if (isset($_REQUEST['_method']) && $_REQUEST['_method'] === 'DELETE') {
+			$upload_handler->delete();
+		} else {
+			$upload_handler->post();
+		}
+		break;
+	case 'DELETE':
+		$upload_handler->delete();
+		break;
+	default:
+		header('HTTP/1.0 405 Method Not Allowed');
+		exit;
 }
 
 $db->close();
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 0d662b6a0bd..e1a5c451ba5 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -68,4 +68,4 @@ else
 
 // Registering new values
 if (($action == 'set') && ! empty($id))
-    $object->setValueFrom($field, $value, $element, $id);
+	$object->setValueFrom($field, $value, $element, $id);
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 1cbede80339..39c2bf7b07f 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -44,8 +44,8 @@ if (isset($_GET['action']) && ! empty($_GET['action']))
 {
 	if ($_GET['action'] == 'getrandompassword' && $user->admin)
 	{
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-	    $generic = $_GET['generic'] ? true : false;
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+		$generic = $_GET['generic'] ? true : false;
 		echo getRandomPassword($generic);
 	}
 }
diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
index df9f70da1df..72eb73f84e0 100644
--- a/htdocs/core/ajax/ziptown.php
+++ b/htdocs/core/ajax/ziptown.php
@@ -62,36 +62,36 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
 
 	if (! empty($conf->global->MAIN_USE_ZIPTOWN_DICTIONNARY))   // Use zip-town table
 	{
-    	$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
-    	$sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country";
-    	$sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
-    	$sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
-    	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
-    	$sql.= " ".MAIN_DB_PREFIX."c_country as c";
-    	$sql.= " WHERE z.fk_pays = c.rowid";
-    	$sql.= " AND z.active = 1 AND c.active = 1";
-    	if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
-    	if ($town)    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
-    	$sql.= " ORDER BY z.zip, z.town";
-        $sql.= $db->plimit(100); // Avoid pb with bad criteria
+		$sql = "SELECT z.rowid, z.zip, z.town, z.fk_county, z.fk_pays as fk_country";
+		$sql.= ", c.rowid as fk_country, c.code as country_code, c.label as country";
+		$sql.= ", d.rowid as fk_county, d.code_departement as county_code, d.nom as county";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_ziptown as z";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON z.fk_county = d.rowid";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as r ON d.fk_region = r.code_region,";
+		$sql.= " ".MAIN_DB_PREFIX."c_country as c";
+		$sql.= " WHERE z.fk_pays = c.rowid";
+		$sql.= " AND z.active = 1 AND c.active = 1";
+		if ($zipcode) $sql.=" AND z.zip LIKE '" . $db->escape($zipcode) . "%'";
+		if ($town)    $sql.=" AND z.town LIKE '%" . $db->escape($town) . "%'";
+		$sql.= " ORDER BY z.zip, z.town";
+		$sql.= $db->plimit(100); // Avoid pb with bad criteria
 	}
 	else                                               // Use table of third parties
 	{
-        $sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
-        $sql.= ", c.code as country_code, c.label as country";
-        $sql.= ", d.code_departement as county_code , d.nom as county";
-        $sql.= " FROM ".MAIN_DB_PREFIX.'societe as s';
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON s.fk_departement = d.rowid";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
-        $sql.= " WHERE";
-        if ($zipcode) $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
-        if ($town)    $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
-        $sql.= " ORDER BY s.fk_pays, s.zip, s.town";
-        $sql.= $db->plimit(100); // Avoid pb with bad criteria
+		$sql = "SELECT DISTINCT s.zip, s.town, s.fk_departement as fk_county, s.fk_pays as fk_country";
+		$sql.= ", c.code as country_code, c.label as country";
+		$sql.= ", d.code_departement as county_code , d.nom as county";
+		$sql.= " FROM ".MAIN_DB_PREFIX.'societe as s';
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX ."c_departements as d ON s.fk_departement = d.rowid";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX.'c_country as c ON s.fk_pays = c.rowid';
+		$sql.= " WHERE";
+		if ($zipcode) $sql.= " s.zip LIKE '".$db->escape($zipcode)."%'";
+		if ($town)    $sql.= " s.town LIKE '%" . $db->escape($town) . "%'";
+		$sql.= " ORDER BY s.fk_pays, s.zip, s.town";
+		$sql.= $db->plimit(100); // Avoid pb with bad criteria
 	}
 
-    //print $sql;
+	//print $sql;
 	$resql=$db->query($sql);
 	//var_dump($db);
 	if ($resql)
@@ -103,11 +103,11 @@ if (! empty($_GET['zipcode']) || ! empty($_GET['town']))
 
 			$row_array['label'] = $row['zip'].' '.$row['town'];
 			$row_array['label'] .= ($county || $country)?' (':'';
-            $row_array['label'] .= $county;
+			$row_array['label'] .= $county;
 			$row_array['label'] .= ($county && $country?' - ':'');
-            $row_array['label'] .= $country;
-            $row_array['label'] .= ($county || $country)?')':'';
-            if ($zipcode)
+			$row_array['label'] .= $country;
+			$row_array['label'] .= ($county || $country)?')':'';
+			if ($zipcode)
 			{
 				$row_array['value'] = $row['zip'];
 				$row_array['town'] = $row['town'];
diff --git a/htdocs/core/antispamimage.php b/htdocs/core/antispamimage.php
index 015f4597d12..38bb261e068 100644
--- a/htdocs/core/antispamimage.php
+++ b/htdocs/core/antispamimage.php
@@ -43,7 +43,7 @@ $number = strlen($letters);
 $string = '';
 for($i = 0; $i < $length; $i++)
 {
-    $string .= $letters{mt_rand(0, $number - 1)};
+	$string .= $letters{mt_rand(0, $number - 1)};
 }
 //print $string;
 
@@ -54,8 +54,8 @@ $_SESSION[$sessionkey]=$string;
 $img = imagecreate(80, 32);
 if (empty($img))
 {
-    dol_print_error('', "Problem with GD creation");
-    exit;
+	dol_print_error('', "Problem with GD creation");
+	exit;
 }
 
 // Define mime type
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index c231a36402d..1c09d2ed48e 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -95,7 +95,7 @@ abstract class CommonInvoice extends CommonObject
 	 *  This does not include open direct debit requests.
 	 *
 	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		double						Remain of amount to pay
+	 *	@return		double					Remain of amount to pay
 	 */
 	public function getRemainToPay($multicurrency = 0)
 	{
@@ -104,7 +104,7 @@ abstract class CommonInvoice extends CommonObject
 	    $alreadypaid+=$this->getSumDepositsUsed($multicurrency);
 	    $alreadypaid+=$this->getSumCreditNotesUsed($multicurrency);
 
-	    $remaintopay = ($this->total_ttc - $alreadypaid);
+	    $remaintopay = price2num($this->total_ttc - $alreadypaid, 'MT');
 	    if ($this->statut == self::STATUS_CLOSED && $this->close_code == 'discount_vat') {		// If invoice closed with discount for anticipated payment
 	    	$remaintopay = 0;
 	    }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index e1246d8bc3f..12eb1c62e8c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -87,6 +87,11 @@ abstract class CommonObject
 	 */
 	public $array_options = array();
 
+	/**
+	 * @var mixed		Array to store alternative languages values of object
+	 */
+	public $array_languages = null;			// Value is array() when load already tried
+
 	/**
 	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked
 	 */
@@ -5041,6 +5046,72 @@ abstract class CommonObject
 	}
 
 
+	/* Functions for data in other language */
+
+
+	/**
+	 *  Function to get alternative languages of a data into $this->array_languages
+	 *  This method is NOT called by method fetch of objects but must be called separately.
+	 *
+	 *  @return	int						<0 if error, 0 if no values of alternative languages to find nor found, 1 if a value was found and loaded
+	 */
+	public function fetchValueForAlternateLanguages()
+	{
+		// To avoid SQL errors. Probably not the better solution though
+		if (!$this->element) {
+			return 0;
+		}
+		if (! ($this->id > 0)) {
+			return 0;
+		}
+
+		$this->array_languages = array();
+
+		$element = $this->element;
+		if ($element == 'categorie') $element = 'categories'; // For compatibility
+
+		// Request to get translation values for object
+		$sql = "SELECT rowid, property, lang , value";
+		$sql .= " FROM ".MAIN_DB_PREFIX."object_lang";
+		$sql .= " WHERE type_object = '".$element."'";
+		$sql .= " AND fk_object = ".$this->id;
+
+		//dol_syslog(get_class($this)."::fetch_optionals get extrafields data for ".$this->table_element, LOG_DEBUG);		// Too verbose
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows)
+			{
+				$tab = $this->db->fetch_array($resql);
+
+				foreach ($tab as $key => $value)
+				{
+					// we can add this attribute to object
+					if (preg_match('/date/', $key))
+					{
+						$this->array_languages[$key] = $this->db->jdate($value);
+					}
+					else
+					{
+						$this->array_languages[$key] = $value;
+					}
+				}
+			}
+
+			$this->db->free($resql);
+
+			if ($numrows) return $numrows;
+			else return 0;
+		}
+		else
+		{
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+
 	/* Functions for extrafields */
 
 
@@ -5059,6 +5130,7 @@ abstract class CommonObject
 		global $extrafields;
 
 		if (empty($rowid)) $rowid = $this->id;
+		if (empty($rowid)) $rowid = $this->rowid;
 
 		// To avoid SQL errors. Probably not the better solution though
 		if (!$this->table_element) {
@@ -5110,7 +5182,6 @@ abstract class CommonObject
 			$resql = $this->db->query($sql);
 			if ($resql)
 			{
-				$this->array_options = array();
 				$numrows = $this->db->num_rows($resql);
 				if ($numrows)
 				{
@@ -6679,9 +6750,10 @@ abstract class CommonObject
 				if (($mode == 'create' || $mode == 'edit') && abs($visibility) != 1 && abs($visibility) != 3) continue; // <> -1 and <> 1 and <> 3 = not visible on forms, only on list
 				elseif ($mode == 'view' && empty($visibility)) continue;
 				if (empty($perms)) continue;
-
 				// Load language if required
-				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) $langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				if (!empty($extrafields->attributes[$this->table_element]['langfile'][$key])) {
+					$langs->load($extrafields->attributes[$this->table_element]['langfile'][$key]);
+				}
 
 				$colspan = '';
 				if (is_array($params) && count($params) > 0) {
@@ -6780,8 +6852,8 @@ abstract class CommonObject
 					{
 						$value = GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) ?price2num(GETPOST($keyprefix.'options_'.$key.$keysuffix, 'alpha', 3)) : $this->array_options['options_'.$key];
 					}
-
 					$labeltoshow = $langs->trans($label);
+					$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
 
 					$out .= '<td class="';
 					//$out .= "titlefield";
@@ -6790,14 +6862,13 @@ abstract class CommonObject
 					$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
 					if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
 						$out .= '">';
-						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
+						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
 						else $out .= $labeltoshow;
 						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= '&nbsp;<font color="red">*</font>';
 					} else {
 						if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) $out .= ' fieldrequired';
-						$out .= '"';
-						$out .= '>';
-						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $extrafields->attributes[$this->table_element]['help'][$key]);
+						$out .= '">';
+						if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) $out .= $form->textwithpicto($labeltoshow, $helptoshow);
 						else $out .= $labeltoshow;
 					}
 					$out .= '</td>';
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 023a2e6dc6d..448d1ffdf8d 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -50,13 +50,13 @@ abstract class CommonObjectLine extends CommonObject
 	public $fk_unit;
 
 
-    /**
-     *	Returns the translation key from units dictionary.
-     *  A langs->trans() must be called on result to get translated value.
-     *
-     * 	@param	string $type Label type (long or short)
-     *	@return	string|int <0 if ko, label if ok
-     */
+	/**
+	 *	Returns the translation key from units dictionary.
+	 *  A langs->trans() must be called on result to get translated value.
+	 *
+	 * 	@param	string $type Label type (long or short)
+	 *	@return	string|int <0 if ko, label if ok
+	 */
 	public function getLabelOfUnit($type = 'long')
 	{
 		global $langs;
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index c3707b18972..bf85699a9fe 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -62,6 +62,7 @@ class DiscountAbsolute
     public $multicurrency_amount_ttc;
     // Vat rate
     public $tva_tx;
+    public $vat_src_code;
 
     /**
 	 * @var int User ID Id utilisateur qui accorde la remise
@@ -133,7 +134,7 @@ class DiscountAbsolute
 
         $sql = "SELECT sr.rowid, sr.fk_soc, sr.discount_type,";
         $sql.= " sr.fk_user,";
-        $sql.= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
+        $sql.= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx, sr.vat_src_code,";
         $sql.= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
         $sql.= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";
         $sql.= " sr.datec,";
@@ -168,6 +169,8 @@ class DiscountAbsolute
                 $this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;
 
                 $this->tva_tx = $obj->tva_tx;
+                $this->vat_src_code = $obj->vat_src_code;
+
                 $this->fk_user = $obj->fk_user;
                 $this->fk_facture_line = $obj->fk_facture_line;
                 $this->fk_facture = $obj->fk_facture;
@@ -244,12 +247,12 @@ class DiscountAbsolute
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
         $sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";
-        $sql .= " amount_ht, amount_tva, amount_ttc, tva_tx,";
+        $sql .= " amount_ht, amount_tva, amount_ttc, tva_tx, vat_src_code,";
         $sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
         $sql .= " fk_facture_source, fk_invoice_supplier_source";
         $sql .= ")";
         $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".$userid.", '".$this->db->escape($this->description)."',";
-        $sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
+        $sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.", '".$this->db->escape($this->vat_src_code)."',";
         $sql .= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";
         $sql .= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null").",";
         $sql .= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'" : "null");
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index 94504686718..47634408a97 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -392,6 +392,7 @@ class ExtraFields
 		if (empty($list)) $list = '0';
 		if (empty($required)) $required = 0;
 		if (empty($unique)) $unique = 0;
+		if (empty($printable)) $printable = 0;
 		if (empty($alwayseditable)) $alwayseditable = 0;
 		if (empty($totalizable)) $totalizable = 0;
 
@@ -1590,9 +1591,9 @@ class ExtraFields
 		 if ($type == 'date') $out.=' (YYYY-MM-DD)';
 		 elseif ($type == 'datetime') $out.=' (YYYY-MM-DD HH:MM:SS)';
 		 */
-		if (! empty($help) && $keyprefix != 'search_options_') {
+		/*if (! empty($help) && $keyprefix != 'search_options_') {
 			$out .= $form->textwithpicto('', $help, 1, 'help', '', 0, 3);
-		}
+		}*/
 		return $out;
 	}
 
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 2c22e83f786..37897738c38 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -316,6 +316,56 @@ class Form
 		return $ret;
 	}
 
+	/**
+	 * Output edit in place form
+	 *
+	 * @param   string	$fieldname		Name of the field
+	 * @param	object	$object			Object
+	 * @param	boolean	$perm			Permission to allow button to edit parameter. Set it to 0 to have a not edited field.
+	 * @param	string	$typeofdata		Type of data ('string' by default, 'email', 'amount:99', 'numeric:99', 'text' or 'textarea:rows:cols', 'datepicker' ('day' do not work, don't know why), 'ckeditor:dolibarr_zzz:width:height:savemethod:1:rows:cols', 'select;xxx[:class]'...)
+	 * @param	string	$check			Same coe than $check parameter of GETPOST()
+	 * @param	string	$morecss		More CSS
+	 * @return	string   		      	HTML code for the edit of alternative language
+	 */
+	public function widgetForTranslation($fieldname, $object, $perm, $typeofdata = 'string', $check = '', $morecss = '')
+	{
+		global $conf, $langs;
+
+		$result = '';
+
+		if (! empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE)) {
+			$langcode = $conf->global->PDF_USE_ALSO_LANGUAGE_CODE;
+
+			$result .='<div class="inline-block paddingleft image-'.$object->element.'-'.$fieldname.'">';
+			$s=img_picto($langs->trans("ShowOtherLanguages"), 'language', '', false, 0, 0, '', 'fa-15 editfieldlang');
+			$result .= $s;
+			$result .= '</div>';
+
+			$result .='<div class="inline-block hidden field-'.$object->element.'-'.$fieldname.'">';
+
+			$valuetoshow = GETPOSTISSET($fieldname."-".$langcode) ? GETPOST($fieldname."-".$langcode, $check) : '';
+			if (empty($valuetoshow)) {
+				$object->fetchValueForAlternateLanguages();
+				//var_dump($object->array_languages);
+				$valuetoshow = $object->array_languages[$fieldname][$langcode];
+			}
+
+			$s=picto_from_langcode($conf->global->PDF_USE_ALSO_LANGUAGE_CODE, 'class="pictoforlang"');
+			$result .= $s;
+			if ($typeofdata == 'textarea') {
+				$result .= '<textarea name="'.$fieldname."-".$langcode.'" id="'.$fieldname."-".$langcode.'" class="'.$morecss.'" rows="'.ROWS_2.'" wrap="soft">';
+				$result .= $object->address;
+				$result .= '</textarea>';
+			} else {
+				$result .= '<input type="text" class="inputfieldforlang '.($morecss ? ' '.$morecss : '').'" name="'.$fieldname."-".$langcode.'" value="'.$valuetoshow.'">';
+			}
+			$result .= '</div>';
+			$result .= '<script>$(".image-'.$object->element.'-'.$fieldname.'").click(function() { console.log("Toggle lang widget"); jQuery(".field-'.$object->element.'-'.$fieldname.'").toggle(); });</script>';
+		}
+
+		return $result;
+	}
+
 	/**
 	 * Output edit in place form
 	 *
@@ -642,12 +692,14 @@ class Form
     	  				/* console.log( index + ": " + $( this ).text() ); */
     	  				if ($(this).is(\':checked\')) atleastoneselected++;
     	  			});
+
 					console.log("initCheckForSelect mode="+mode+" atleastoneselected="+atleastoneselected);
+
     	  			if (atleastoneselected || '.$alwaysvisible.')
     	  			{
     	  				jQuery(".massaction").show();
-        			    '.($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("'.$selected.'"); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '').'
-        			    '.($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0"); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '').'
+        			    '.($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("'.$selected.'").trigger(\'change\'); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '').'
+        			    '.($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0").trigger(\'change\'); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '').'
     	  			}
     	  			else
     	  			{
@@ -2114,7 +2166,7 @@ class Form
 			}
 		}
 
-		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
+		$selectFields = " p.rowid, p.ref, p.label, p.description, p.barcode, p.fk_country, p.fk_product_type, p.price, p.price_ttc, p.price_base_type, p.tva_tx, p.duration, p.fk_price_expression";
 		if (count($warehouseStatusArray))
 		{
 		    $selectFieldsGrouped = ", sum(".$db->ifsql("e.statut IS NULL", "0", "ps.reel").") as stock"; // e.statut is null if there is no record in stock
@@ -2418,6 +2470,7 @@ class Form
 		$outlabel = '';
 		$outdesc = '';
 		$outbarcode = '';
+		$outorigin = '';
 		$outtype = '';
 		$outprice_ht = '';
 		$outprice_ttc = '';
@@ -2437,6 +2490,7 @@ class Form
 		$outlabel = $objp->label;
 		$outdesc = $objp->description;
 		$outbarcode = $objp->barcode;
+		$outorigin = $objp->fk_country;
 		$outpbq = empty($objp->price_by_qty_rowid) ? '' : $objp->price_by_qty_rowid;
 
 		$outtype = $objp->fk_product_type;
@@ -2498,12 +2552,15 @@ class Form
 		$opt .= $objp->ref;
 		if ($outbarcode) $opt .= ' ('.$outbarcode.')';
 		$opt .= ' - '.dol_trunc($label, $maxlengtharticle);
+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $opt .= ' ('.getCountry($outorigin, 1).')';
 
 		$objRef = $objp->ref;
 		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRef, 1);
 		$outval .= $objRef;
 		if ($outbarcode) $outval .= ' ('.$outbarcode.')';
 		$outval .= ' - '.dol_trunc($label, $maxlengtharticle);
+		if ($outorigin && !empty($conf->global->PRODUCT_SHOW_ORIGIN_IN_COMBO)) $outval .= ' ('.getCountry($outorigin, 1).')';
+
         // Units
         $opt .= $outvalUnits;
         $outval .= $outvalUnits;
@@ -3514,11 +3571,11 @@ class Form
 	 *      Return list of payment methods
 	 *      Constant MAIN_DEFAULT_PAYMENT_TYPE_ID can used to set default value but scope is all application, probably not what you want.
 	 *
-	 *      @param	string	$selected       Id du mode de paiement pre-selectionne
-	 *      @param  string	$htmlname       Nom de la zone select
+	 *      @param	string	$selected       Id or code or preselected payment mode
+	 *      @param  string	$htmlname       Name of select field
 	 *      @param  string	$filtertype     To filter on field type in llx_c_paiement ('CRDT' or 'DBIT' or array('code'=>xx,'label'=>zz))
-	 *      @param  int		$format         0=id+libelle, 1=code+code, 2=code+libelle, 3=id+code
-	 *      @param  int		$empty			1=peut etre vide, 0 sinon
+	 *      @param  int		$format         0=id+label, 1=code+code, 2=code+label, 3=id+code
+	 *      @param  int		$empty			1=can be empty, 0 otherwise
 	 * 		@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
@@ -3559,9 +3616,12 @@ class Form
 			elseif ($format == 1) print '<option value="'.$arraytypes['code'].'"';
 			elseif ($format == 2) print '<option value="'.$arraytypes['code'].'"';
 			elseif ($format == 3) print '<option value="'.$id.'"';
-			// Si selected est text, on compare avec code, sinon avec id
-			if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) print ' selected';
-			elseif ($selected == $id) print ' selected';
+			// Print attribute selected or not
+			if ($format==1 || $format==2) {
+				if ($selected == $arraytypes['code']) print ' selected';
+			} else {
+				if ($selected == $id) print ' selected';
+			}
 			print '>';
 			if ($format == 0) $value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
 			elseif ($format == 1) $value = $arraytypes['code'];
@@ -4740,7 +4800,7 @@ class Form
 			print '<form method="POST" action="'.$page.'">';
 			print '<input type="hidden" name="action" value="setmulticurrencyrate">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
-			print '<input type="text" name="'.$htmlname.'" value="'.(!empty($rate) ? price($rate) : 1).'" size="10" /> ';
+			print '<input type="text" class="maxwidth100" name="'.$htmlname.'" value="'.(!empty($rate) ? price(price2num($rate, 'CR')) : 1).'" /> ';
 			print '<select name="calculation_mode">';
 			print '<option value="1">'.$currency.' > '.$conf->currency.'</option>';
 			print '<option value="2">'.$conf->currency.' > '.$currency.'</option>';
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 433dd020c1d..9b541cc9c3a 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -375,7 +375,11 @@ class FormProjets
 			}
 			if (! empty($show_empty)) {
 				$out.= '<option value="0" class="optiongrey">';
-				if (! is_numeric($show_empty)) $out.=$show_empty;
+				if (! is_numeric($show_empty)) {
+					//if (! empty($conf->use_javascript_ajax)) $out .= '<span class="opacitymedium">aaa';
+					$out.=$show_empty;
+					//if (! empty($conf->use_javascript_ajax)) $out .= '</span>';
+				}
 				else $out.='&nbsp;';
 				$out.= '</option>';
 			}
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index 26de63f10cc..9620612cb2e 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -198,7 +198,7 @@ abstract class Stats
 			// $data = array('xval'=>array(0=>xlabel,1=>yval1,2=>yval2...),...)
 			for ($i = 0; $i < 12; $i++)
 			{
-				$data[$i][] = $datay[$endyear][($i + $sm) % 12]['label']; // set label
+				$data[$i][] = isset($datay[$endyear][($i + $sm) % 12]['label']) ? $datay[$endyear][($i + $sm) % 12]['label'] : $datay[$endyear][($i + $sm) % 12][0]; // set label
 				$year = $startyear;
 				while ($year <= $endyear)
 				{
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 4406d421745..c37041967c2 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -67,18 +67,18 @@ else
 
 // Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8)
 $tradTemp=array(
-    $langs->trans("January"),
-    $langs->trans("February"),
-    $langs->trans("March"),
-    $langs->trans("April"),
-    $langs->trans("May"),
-    $langs->trans("June"),
-    $langs->trans("July"),
-    $langs->trans("August"),
-    $langs->trans("September"),
-    $langs->trans("October"),
-    $langs->trans("November"),
-    $langs->trans("December")
+	$langs->trans("January"),
+	$langs->trans("February"),
+	$langs->trans("March"),
+	$langs->trans("April"),
+	$langs->trans("May"),
+	$langs->trans("June"),
+	$langs->trans("July"),
+	$langs->trans("August"),
+	$langs->trans("September"),
+	$langs->trans("October"),
+	$langs->trans("November"),
+	$langs->trans("December")
 );
 print '<script type="text/javascript">';
 print 'var tradMonths = [';
@@ -236,8 +236,8 @@ function displayBox($selectedDate, $month, $year)
 
 		if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput")
 		{
-		    print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
-		    exit;
+			print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
+			exit;
 		}
 
 		// Sur click dans calendrier, appelle fonction dpClickDay
diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php
index 462fba9f23d..9364f3bd540 100644
--- a/htdocs/core/filemanagerdol/connectors/php/upload.php
+++ b/htdocs/core/filemanagerdol/connectors/php/upload.php
@@ -57,7 +57,7 @@ if (! IsAllowedCommand($sCommand))
 
 // Check if it is an allowed type.
 if (! IsAllowedType($sType))
-    SendUploadResults(1, '', '', 'Invalid type specified');
+	SendUploadResults(1, '', '', 'Invalid type specified');
 
 
 // @CHANGE
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
index fc07c1bc340..9f80b96b2fd 100644
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ b/htdocs/core/filemanagerdol/connectors/php/util.php
@@ -209,24 +209,24 @@ function IsImageValid($filePath, $extension)
 	}
 
 	$imageCheckExtensions = array(
-        'gif',
-        'jpeg',
-        'jpg',
-        'png',
-        'swf',
-        'psd',
-        'bmp',
-        'iff',
-        'tiff',
-        'tif',
-        'swc',
-        'jpc',
-        'jp2',
-        'jpx',
-        'jb2',
-        'xbm',
-        'wbmp'
-    );
+		'gif',
+		'jpeg',
+		'jpg',
+		'png',
+		'swf',
+		'psd',
+		'bmp',
+		'iff',
+		'tiff',
+		'tif',
+		'swc',
+		'jpc',
+		'jp2',
+		'jpx',
+		'jb2',
+		'xbm',
+		'wbmp'
+	);
 
 	if (!in_array($extension, $imageCheckExtensions) ) {
 		return true;
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 9f8fda42d61..a35fee85d0a 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -524,8 +524,9 @@ function hideMessage(fieldId,message) {
  * @param	int		entity		Entity
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
+ * @param   int     userid      User id
  */
-function setConstant(url, code, input, entity, strict, forcereload) {
+function setConstant(url, code, input, entity, strict, forcereload, userid) {
 	$.get( url, {
 		action: "set",
 		name: code,
@@ -593,8 +594,9 @@ function setConstant(url, code, input, entity, strict, forcereload) {
  * @param	int		entity		Entity
  * @param	int		strict		Strict
  * @param   int     forcereload Force reload
+ * @param   int     userid      User id
  */
-function delConstant(url, code, input, entity, strict, forcereload) {
+function delConstant(url, code, input, entity, strict, forcereload, userid) {
 	$.get( url, {
 		action: "del",
 		name: code,
@@ -661,8 +663,9 @@ function delConstant(url, code, input, entity, strict, forcereload) {
  * @param	int		yesButton	yesButton
  * @param	int		noButton	noButton
  * @param	int		strict		Strict
+ * @param   int     userid      User id
  */
-function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton, strict) {
+function confirmConstantAction(action, url, code, input, box, entity, yesButton, noButton, strict, userid) {
 	var boxConfirm = box;
 	$("#confirm_" + code)
 			.attr("title", boxConfirm.title)
@@ -678,9 +681,9 @@ function confirmConstantAction(action, url, code, input, box, entity, yesButton,
 						text : yesButton,
 						click : function() {
 							if (action == "set") {
-								setConstant(url, code, input, entity, strict);
+								setConstant(url, code, input, entity, strict, 0, userid);
 							} else if (action == "del") {
-								delConstant(url, code, input, entity, strict);
+								delConstant(url, code, input, entity, strict, 0, userid);
 							}
 							// Close dialog
 							$(this).dialog("close");
diff --git a/htdocs/core/js/lib_notification.js.php b/htdocs/core/js/lib_notification.js.php
index 04b325c3ab8..e78161d167d 100644
--- a/htdocs/core/js/lib_notification.js.php
+++ b/htdocs/core/js/lib_notification.js.php
@@ -74,10 +74,10 @@ if (! ($_SERVER['HTTP_REFERER'] === $dolibarr_main_url_root . '/' || $_SERVER['H
                     if (arr.length > 0) {
                     	var audio = null;
                         <?php
-                        if (! empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
-                            print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
-                        }
-                        ?>
+						if (! empty($conf->global->AGENDA_REMINDER_BROWSER_SOUND)) {
+							print 'audio = new Audio(\''.DOL_URL_ROOT.'/theme/common/sound/notification_agenda.wav'.'\');';
+						}
+						?>
 
                         $.each(arr, function (index, value) {
                             var url="notdefined";
diff --git a/htdocs/core/js/timesheet.js b/htdocs/core/js/timesheet.js
index 5c9ba74e379..aea8f9a1318 100644
--- a/htdocs/core/js/timesheet.js
+++ b/htdocs/core/js/timesheet.js
@@ -120,7 +120,11 @@ function updateTotal(days,mode)
         total.setHours(0);
         total.setMinutes(0);
         var nbline = document.getElementById('numberOfLines').value;
-        for (var i=-1; i<nbline; i++)
+        var startline = 0;
+        if (document.getElementById('numberOfFirstLine')) {
+        	startline = parseInt(document.getElementById('numberOfFirstLine').value);
+        }
+        for (var i=-1; i < nbline; i++)
         {
             var id='timespent['+i+']['+days+']';
             var taskTime= new Date(0);
@@ -213,17 +217,27 @@ function updateTotal(days,mode)
         		console.log(total.getMinutes())
             }
         });
-
-        if (total.getHours() || total.getMinutes()) jQuery('.totalDay'+days).addClass("bold");
-        else jQuery('.totalDay'+days).removeClass("bold");
-    	jQuery('.totalDay'+days).text(pad(total.getHours())+':'+pad(total.getMinutes()));
+        
+        var stringdays = days;
+        if (startline >= 1 && startline <= 9 && stringdays < 10) {
+        	stringdays = '0'+stringdays;
+        }
+        
+        if (total.getHours() || total.getMinutes()) jQuery('.totalDay'+stringdays).addClass("bold");
+        else jQuery('.totalDay'+stringdays).removeClass("bold");
+    	jQuery('.totalDay'+stringdays).text(pad(total.getHours())+':'+pad(total.getMinutes()));
 
     	var totalhour = 0;
     	var totalmin = 0;
         for (var i=0; i<7; i++)
         {
+        	stringdays = (i + startline);
+            if (startline >= 1 && startline <= 9 && stringdays < 10) {
+            	stringdays = '0'+stringdays;
+            }
+
         	var taskTime= new Date(0);
-        	result=parseTime(jQuery('.totalDay'+i).text(),taskTime);
+       		result=parseTime(jQuery('.totalDay'+stringdays).text(),taskTime);
         	if (result >= 0)
         	{
         		totalhour = totalhour + taskTime.getHours();
@@ -273,8 +287,14 @@ function updateTotal(days,mode)
             }
         }
 
-        if (total) jQuery('.totalDay'+days).addClass("bold");
-        else jQuery('.totalDay'+days).removeClass("bold");
-    	jQuery('.totalDay'+days).text(total);
+        var stringdays = days;
+        if (startline >= 1 && startline <= 9 && stringdays < 10) {
+        	stringdays = '0'+stringdays;
+        	console.log(stringdays);
+        }
+        
+        if (total) jQuery('.totalDay'+stringdays).addClass("bold");
+        else jQuery('.totalDay'+stringdays).removeClass("bold");
+    	jQuery('.totalDay'+stringdays).text(total);
     }
 }
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index dd1810fdf5f..e5d7422cf8a 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -59,7 +59,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
 	// Filters
 	//print '<form name="listactionsfilter" class="listactionsfilter" action="' . $_SERVER["PHP_SELF"] . '" method="get">';
-	print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
+	print '<input type="hidden" name="token" value="' . newToken() . '">';
 	print '<input type="hidden" name="year" value="' . $year . '">';
 	print '<input type="hidden" name="month" value="' . $month . '">';
 	print '<input type="hidden" name="day" value="' . $day . '">';
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 58567748f7f..c29b82f4329 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -485,7 +485,7 @@ function ajax_combobox($htmlname, $events = array(), $minLengthToAutocomplete =
  */
 function ajax_constantonoff($code, $input = array(), $entity = null, $revertonoff = 0, $strict = 0, $forcereload = 0, $marginleftonlyshort = 2)
 {
-	global $conf, $langs;
+	global $conf, $langs, $user;
 
 	$entity = ((isset($entity) && is_numeric($entity) && $entity >= 0) ? $entity : $conf->entity);
 
@@ -504,6 +504,7 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 				var code = \''.$code.'\';
 				var entity = \''.$entity.'\';
 				var strict = \''.$strict.'\';
+				var userid = \''.$user->id.'\';
 				var yesButton = "'.dol_escape_js($langs->transnoentities("Yes")).'";
 				var noButton = "'.dol_escape_js($langs->transnoentities("No")).'";
 
@@ -512,9 +513,9 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 					if (input.alert && input.alert.set) {
 						if (input.alert.set.yesButton) yesButton = input.alert.set.yesButton;
 						if (input.alert.set.noButton)  noButton = input.alert.set.noButton;
-						confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict);
+						confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict, userid);
 					} else {
-						setConstant(url, code, input, entity, 0, '.$forcereload.');
+						setConstant(url, code, input, entity, 0, '.$forcereload.', userid);
 					}
 				});
 
@@ -523,9 +524,9 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 					if (input.alert && input.alert.del) {
 						if (input.alert.del.yesButton) yesButton = input.alert.del.yesButton;
 						if (input.alert.del.noButton)  noButton = input.alert.del.noButton;
-						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict);
+						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid);
 					} else {
-						delConstant(url, code, input, entity, 0, '.$forcereload.');
+						delConstant(url, code, input, entity, 0, '.$forcereload.', userid);
 					}
 				});
 			});
diff --git a/htdocs/core/lib/categories.lib.php b/htdocs/core/lib/categories.lib.php
index 7d6801352cb..ca665637768 100644
--- a/htdocs/core/lib/categories.lib.php
+++ b/htdocs/core/lib/categories.lib.php
@@ -34,7 +34,7 @@ function categories_prepare_head($object, $type)
 	global $langs, $conf, $user;
 
 	// Load translation files required by the page
-    $langs->loadLangs(array('categories', 'products'));
+	$langs->loadLangs(array('categories', 'products'));
 
 	$h = 0;
 	$head = array();
@@ -51,19 +51,19 @@ function categories_prepare_head($object, $type)
 
 	if (! empty($conf->global->MAIN_MULTILANGS))
 	{
-    	$head[$h][0] = DOL_URL_ROOT.'/categories/traduction.php?id='.$object->id.'&amp;type='.$type;
-    	$head[$h][1] = $langs->trans("Translation");
-    	$head[$h][2] = 'translation';
-    	$h++;
+		$head[$h][0] = DOL_URL_ROOT.'/categories/traduction.php?id='.$object->id.'&amp;type='.$type;
+		$head[$h][1] = $langs->trans("Translation");
+		$head[$h][2] = 'translation';
+		$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, 'categories_'.$type);
+	// 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, 'categories_'.$type);
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'categories_'.$type, 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'categories_'.$type, 'remove');
 
 	return $head;
 }
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 700c3f0410f..eac9f404188 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -104,8 +104,9 @@ function societe_prepare_head(Societe $object)
             $h++;
         }
     }
-	if (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $supplier_module_enabled=1;
-    if ($supplier_module_enabled==1 && $object->fournisseur && !empty($user->rights->fournisseur->lire))
+    $supplier_module_enabled = 0;
+    if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) $supplier_module_enabled=1;
+    if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire))
     {
         $head[$h][0] = DOL_URL_ROOT.'/fourn/card.php?socid='.$object->id;
         $head[$h][1] = $langs->trans("Supplier");
@@ -1099,7 +1100,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
     	if (!empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
     	if ($key == 'role') $align .= ($align ? ' ' : '').'left';
     	if (!empty($arrayfields['sc.'.$key]['checked'])) {
-    		print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 'sc.'.$key, '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
+    		print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 	    }
     }
     // Extra fields
@@ -1318,6 +1319,8 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
     }
     $sortfield_new = implode(',', $sortfield_new_list);
 
+    $sql = '';
+
     if (!empty($conf->agenda->enabled))
     {
         // Recherche histo sur actioncomm
@@ -1469,85 +1472,88 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
     }
 
     //TODO Add limit in nb of results
-    $sql .= $db->order($sortfield_new, $sortorder);
-    dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
-    $resql = $db->query($sql);
-    if ($resql)
+    if ($sql)
     {
-        $i = 0;
-        $num = $db->num_rows($resql);
+    	$sql .= $db->order($sortfield_new, $sortorder);
+	    dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
+	    $resql = $db->query($sql);
+	    if ($resql)
+	    {
+	        $i = 0;
+	        $num = $db->num_rows($resql);
 
-        while ($i < $num)
-        {
-            $obj = $db->fetch_object($resql);
+	        while ($i < $num)
+	        {
+	            $obj = $db->fetch_object($resql);
 
-            if ($obj->type == 'action') {
-                $contactaction = new ActionComm($db);
-                $contactaction->id = $obj->id;
-                $result = $contactaction->fetchResources();
-                if ($result < 0) {
-                    dol_print_error($db);
-                    setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');
-                }
+	            if ($obj->type == 'action') {
+	                $contactaction = new ActionComm($db);
+	                $contactaction->id = $obj->id;
+	                $result = $contactaction->fetchResources();
+	                if ($result < 0) {
+	                    dol_print_error($db);
+	                    setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');
+	                }
 
-                //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
-                //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
-                $tododone = '';
-                if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
+	                //if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
+	                //elseif ($donetodo == 'done') $sql.= " AND (a.percent = 100 OR (a.percent = -1 AND a.datep <= '".$db->idate($now)."'))";
+	                $tododone = '';
+	                if (($obj->percent >= 0 and $obj->percent < 100) || ($obj->percent == -1 && $obj->datep > $now)) $tododone = 'todo';
 
-                $histo[$numaction] = array(
-                    'type'=>$obj->type,
-                    'tododone'=>$tododone,
-                    'id'=>$obj->id,
-                    'datestart'=>$db->jdate($obj->dp),
-                    'dateend'=>$db->jdate($obj->dp2),
-                    'note'=>$obj->label,
-                    'percent'=>$obj->percent,
+	                $histo[$numaction] = array(
+	                    'type'=>$obj->type,
+	                    'tododone'=>$tododone,
+	                    'id'=>$obj->id,
+	                    'datestart'=>$db->jdate($obj->dp),
+	                    'dateend'=>$db->jdate($obj->dp2),
+	                    'note'=>$obj->label,
+	                    'percent'=>$obj->percent,
 
-                    'userid'=>$obj->user_id,
-                    'login'=>$obj->user_login,
-                    'userfirstname'=>$obj->user_firstname,
-                    'userlastname'=>$obj->user_lastname,
-                    'userphoto'=>$obj->user_photo,
+	                    'userid'=>$obj->user_id,
+	                    'login'=>$obj->user_login,
+	                    'userfirstname'=>$obj->user_firstname,
+	                    'userlastname'=>$obj->user_lastname,
+	                    'userphoto'=>$obj->user_photo,
 
-                    'contact_id'=>$obj->fk_contact,
-                    'socpeopleassigned' => $contactaction->socpeopleassigned,
-                    'lastname'=>$obj->lastname,
-                    'firstname'=>$obj->firstname,
-                    'fk_element'=>$obj->fk_element,
-                    'elementtype'=>$obj->elementtype,
-                    // Type of event
-                    'acode'=>$obj->acode,
-                    'alabel'=>$obj->alabel,
-                    'libelle'=>$obj->alabel, // deprecated
-                    'apicto'=>$obj->apicto
-                );
-            } else {
-                $histo[$numaction] = array(
-                    'type'=>$obj->type,
-                    'tododone'=>'done',
-                    'id'=>$obj->id,
-                    'datestart'=>$db->jdate($obj->dp),
-                    'dateend'=>$db->jdate($obj->dp2),
-                    'note'=>$obj->label,
-                    'percent'=>$obj->percent,
-                    'acode'=>$obj->acode,
+	                    'contact_id'=>$obj->fk_contact,
+	                    'socpeopleassigned' => $contactaction->socpeopleassigned,
+	                    'lastname'=>$obj->lastname,
+	                    'firstname'=>$obj->firstname,
+	                    'fk_element'=>$obj->fk_element,
+	                    'elementtype'=>$obj->elementtype,
+	                    // Type of event
+	                    'acode'=>$obj->acode,
+	                    'alabel'=>$obj->alabel,
+	                    'libelle'=>$obj->alabel, // deprecated
+	                    'apicto'=>$obj->apicto
+	                );
+	            } else {
+	                $histo[$numaction] = array(
+	                    'type'=>$obj->type,
+	                    'tododone'=>'done',
+	                    'id'=>$obj->id,
+	                    'datestart'=>$db->jdate($obj->dp),
+	                    'dateend'=>$db->jdate($obj->dp2),
+	                    'note'=>$obj->label,
+	                    'percent'=>$obj->percent,
+	                    'acode'=>$obj->acode,
 
-                    'userid'=>$obj->user_id,
-                    'login'=>$obj->user_login,
-                    'userfirstname'=>$obj->user_firstname,
-                    'userlastname'=>$obj->user_lastname,
-                    'userphoto'=>$obj->user_photo
-                );
-            }
+	                    'userid'=>$obj->user_id,
+	                    'login'=>$obj->user_login,
+	                    'userfirstname'=>$obj->user_firstname,
+	                    'userlastname'=>$obj->user_lastname,
+	                    'userphoto'=>$obj->user_photo
+	                );
+	            }
 
-            $numaction++;
-            $i++;
-        }
-    }
-    else
-    {
-        dol_print_error($db);
+	            $numaction++;
+	            $i++;
+	        }
+	    }
+	    else
+	    {
+	        dol_print_error($db);
+	    }
     }
 
     if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email)))
@@ -1782,9 +1788,9 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
         }
         $out .= "</table>\n";
         $out .= "</div>\n";
-    }
 
-    $out .= '</form>';
+        $out .= '</form>';
+    }
 
     if ($noprint) return $out;
     else print $out;
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 6d077d5f2d3..6840e81a646 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -78,12 +78,12 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 		}
 		elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except)
 		{
-		    $discount=new DiscountAbsolute($db);
-		    $discount->fetch($line->fk_remise_except);
-		    $sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
-		    $libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
-		    // Add date of deposit
-		    if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
+			$discount=new DiscountAbsolute($db);
+			$discount->fetch($line->fk_remise_except);
+			$sourceref=!empty($discount->discount_type)?$discount->ref_invoive_supplier_source:$discount->ref_facture_source;
+			$libelleproduitservice=$outputlangs->transnoentitiesnoconv("DiscountFromDeposit", $sourceref);
+			// Add date of deposit
+			if (! empty($conf->global->INVOICE_ADD_DEPOSIT_DATE)) $libelleproduitservice.=' ('.dol_print_date($discount->datec, 'day', '', $outputlangs).')';
 		}
 		elseif ($desc == '(EXCESS RECEIVED)' && $line->fk_remise_except)
 		{
diff --git a/htdocs/core/lib/ecm.lib.php b/htdocs/core/lib/ecm.lib.php
index 3886605129e..a49e501af78 100644
--- a/htdocs/core/lib/ecm.lib.php
+++ b/htdocs/core/lib/ecm.lib.php
@@ -36,8 +36,8 @@ function ecm_prepare_dasboard_head($object)
 
 	$h = 0;
 	$head = array();
-    $helptext =$langs->trans("ECMAreaDesc").'<br>';
-    $helptext.=$langs->trans("ECMAreaDesc2");
+	$helptext =$langs->trans("ECMAreaDesc").'<br>';
+	$helptext.=$langs->trans("ECMAreaDesc2");
 
 	$head[$h][0] = DOL_URL_ROOT.'/ecm/index.php';
 	$head[$h][1] = $langs->trans("ECMSectionsManual").$form->textwithpicto('', $helptext, 1, 'info', '', 0, 3);
@@ -52,13 +52,13 @@ function ecm_prepare_dasboard_head($object)
 		$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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ecm');
+	// 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:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'ecm');
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'ecm', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'ecm', 'remove');
 
 	return $head;
 }
@@ -104,16 +104,16 @@ function ecm_prepare_head($object, $module = 'ecm', $section = '')
  */
 function ecm_file_prepare_head($object)
 {
-    global $langs, $conf, $user;
-    $h = 0;
-    $head = array();
+	global $langs, $conf, $user;
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT.'/ecm/file_card.php?section='.$object->section_id.'&urlfile='.urlencode($object->label);
-    $head[$h][1] = $langs->trans("Card");
-    $head[$h][2] = 'card';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT.'/ecm/file_card.php?section='.$object->section_id.'&urlfile='.urlencode($object->label);
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
 
-    return $head;
+	return $head;
 }
 
 /**
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 35462fcb2d9..1b16f2a2ca5 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -66,9 +66,9 @@ function getDoliDBInstance($type, $host, $user, $pass, $name, $port)
  * 	@param	string	$element		Current element
  *									'societe', 'socpeople', 'actioncomm', 'agenda', 'resource',
  *									'product', 'productprice', 'stock', 'bom', 'mo',
- *									'propal', 'supplier_proposal', 'invoice', 'facture_fourn', 'payment_various',
+ *									'propal', 'supplier_proposal', 'invoice', 'supplier_invoice', 'payment_various',
  *									'categorie', 'bank_account', 'bank_account', 'adherent', 'user',
- *									'commande', 'commande_fournisseur', 'expedition', 'intervention', 'survey',
+ *									'commande', 'supplier_order', 'expedition', 'intervention', 'survey',
  *									'contract', 'tax', 'expensereport', 'holiday', 'multicurrency', 'project',
  *									'email_template', 'event', 'donation'
  *									'c_paiement', 'c_payment_term', ...
@@ -3127,11 +3127,11 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
 
-		//if (in_array($picto, array('switch_off', 'switch_on', 'off', 'on')))
         if (empty($srconly) && in_array($pictowithouttext, array(
         		'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
         		'address', 'barcode', 'bank', 'bookmark', 'building', 'cash-register', 'check', 'close_title', 'cubes', 'delete', 'dolly', 'edit', 'ellipsis-h',
-        		'filter', 'file-code', 'grip', 'grip_title', 'list', 'listlight', 'note',
+        		'filter', 'file-code', 'grip', 'grip_title', 'language', 'list', 'listlight', 'note',
+        		'object_phoning', 'object_phoning_fax', 'object_email',
         		'object_bookmark', 'object_list', 'object_calendar', 'object_calendarweek', 'object_calendarmonth', 'object_calendarday', 'object_calendarperuser',
         		'off', 'on', 'play', 'playdisabled', 'printer', 'resize', 'stats',
 				'note', 'setup', 'sign-out', 'split', 'switch_off', 'switch_on', 'tools', 'unlink', 'uparrow', 'user', 'wrench', 'globe',
@@ -3154,7 +3154,8 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 
 		    $arrayconvpictotofa = array(
 		    	'address'=> 'address-book', 'setup'=>'cog', 'companies'=>'building', 'products'=>'cube', 'commercial'=>'suitcase', 'invoicing'=>'coins', 'accountancy'=>'money-check-alt',
-		    	'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'generic'=>'folder-open',
+		    	'hrm'=>'umbrella-beach', 'members'=>'users', 'ticket'=>'ticket-alt', 'generic'=>'folder-open', 'globe'=>'external-link-alt',
+		    	'object_phoning'=>'phone', 'object_phoning_fax'=>'fax', 'object_email'=>'at',
 		    	'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'check'=>'check', 'object_bookmark'=>'star', 'bookmark'=>'star', 'stats' => 'chart-bar',
 		    	'bank'=>'university', 'close_title'=>'window-close', 'delete'=>'trash', 'edit'=>'pencil', 'filter'=>'filter', 'split'=>'code-branch',
 		    	'object_list'=>'list-alt', 'object_calendar'=>'calendar-alt', 'object_calendarweek'=>'calendar-week', 'object_calendarmonth'=>'calendar-alt', 'object_calendarday'=>'calendar-day', 'object_calendarperuser'=>'table',
@@ -3196,7 +3197,6 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			}
 			elseif ($pictowithouttext == 'delete') {
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
-				$facolor = '#444';
 			}
 			elseif ($pictowithouttext == 'edit') {
 				$facolor = '#444';
@@ -3239,18 +3239,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				$fakey = 'fa-sign-out-alt';
 			    $marginleftonlyshort = 0;
 			}
-			elseif ($pictowithouttext == 'unlink') {
-				$fakey = 'fa-unlink';
-				$facolor = '#555';
-			}
 			elseif ($pictowithouttext == 'playdisabled') {
 				$fakey = 'fa-play';
 				$facolor = '#ccc';
 			}
-			elseif ($pictowithouttext == 'play') {
-				$fakey = 'fa-play';
-				$facolor = '#444';
-			}
 			elseif ($pictowithouttext == 'jabber') {
 				$fakey = 'fa-comment-o';
 			}
@@ -3262,12 +3254,10 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			elseif (!empty($arrayconvpictotofa[$pictowithouttext]))
 			{
 				$fakey = 'fa-'.$arrayconvpictotofa[$pictowithouttext];
-				//$facolor = '#444';
 				$marginleftonlyshort = 0;
 			}
 			else {
 				$fakey = 'fa-'.$pictowithouttext;
-				//$facolor = '#444';
 				$marginleftonlyshort = 0;
 			}
 
@@ -3305,6 +3295,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		}
 
 		// If we ask an image into $url/$mymodule/img (instead of default path)
+		$regs = array();
 		if (preg_match('/^([^@]+)@([^@]+)$/i', $picto, $regs)) {
 			$picto = $regs[1];
 			$path = $regs[2]; // $path is $mymodule
@@ -3538,7 +3529,6 @@ function img_delete($titlealt = 'default', $other = 'class="pictodelete"')
 	if ($titlealt == 'default') $titlealt = $langs->trans('Delete');
 
 	return img_picto($titlealt, 'delete.png', $other);
-	//return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';
 }
 
 /**
@@ -3763,10 +3753,13 @@ function img_allow($allow, $titlealt = 'default')
  *	Return image of a credit card according to its brand name
  *
  *	@param	string	$brand		Brand name of credit card
+ *  @param	string	$morecss	More CSS
  *	@return string     			Return img tag
  */
-function img_credit_card($brand)
+function img_credit_card($brand, $morecss = null)
 {
+	if (is_null($morecss)) $morecss = 'fa-2x';
+
 	if ($brand == 'visa' || $brand == 'Visa') {$brand = 'cc-visa'; }
 	elseif ($brand == 'mastercard' || $brand == 'MasterCard') {$brand = 'cc-mastercard'; }
 	elseif ($brand == 'amex' || $brand == 'American Express') {$brand = 'cc-amex'; }
@@ -3775,7 +3768,7 @@ function img_credit_card($brand)
 	elseif ($brand == 'diners' || $brand == 'Diners club') {$brand = 'cc-diners-club'; }
 	elseif (!in_array($brand, array('cc-visa', 'cc-mastercard', 'cc-amex', 'cc-discover', 'cc-jcb', 'cc-diners-club'))) {$brand = 'credit-card'; }
 
-	return '<span class="fa fa-'.$brand.' fa-2x fa-fw"></span>';
+	return '<span class="fa fa-'.$brand.' fa-fw'.($morecss ? ' '.$morecss : '').'"></span>';
 }
 
 /**
@@ -4656,6 +4649,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
  * 									'MU'=Round to Max unit price (MAIN_MAX_DECIMALS_UNIT)
  *									'MT'=Round to Max for totals with Tax (MAIN_MAX_DECIMALS_TOT)
  *									'MS'=Round to Max for stock quantity (MAIN_MAX_DECIMALS_STOCK)
+ *                                  'CR'=Currency rate
  *									Numeric = Nb of digits for rounding
  * 	@param	int		$alreadysqlnb	Put 1 if you know that content is already universal format number
  *	@return	string					Amount with universal numeric format (Example: '99.99999').
@@ -4709,6 +4703,7 @@ function price2num($amount, $rounding = '', $alreadysqlnb = 0)
 		if ($rounding == 'MU')     $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
 		elseif ($rounding == 'MT') $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
 		elseif ($rounding == 'MS') $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
+		elseif ($rounding == 'CR') $nbofdectoround = 8;
 		elseif (is_numeric($rounding))  $nbofdectoround = $rounding;
 		//print "RR".$amount.' - '.$nbofdectoround.'<br>';
 		if (dol_strlen($nbofdectoround)) $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.
@@ -8425,16 +8420,16 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
 
         // For backward compatibility. Image's filename are still in French, so we use this array to convert
         $statusImg = array(
-        	'status0' => 'statut0'
-        	,'status1' => 'statut1'
-        	,'status2' => 'statut2'
-        	,'status3' => 'statut3'
-        	,'status4' => 'statut4'
-        	,'status5' => 'statut5'
-        	,'status6' => 'statut6'
-        	,'status7' => 'statut7'
-        	,'status8' => 'statut8'
-        	,'status9' => 'statut9'
+        	'status0' => 'statut0',
+        	'status1' => 'statut1',
+        	'status2' => 'statut2',
+        	'status3' => 'statut3',
+        	'status4' => 'statut4',
+        	'status5' => 'statut5',
+        	'status6' => 'statut6',
+        	'status7' => 'statut7',
+        	'status8' => 'statut8',
+        	'status9' => 'statut9'
         );
 
         if (!empty($statusImg[$statusType])) {
diff --git a/htdocs/core/lib/import.lib.php b/htdocs/core/lib/import.lib.php
index 29882d55d4f..32f9d0d87d2 100644
--- a/htdocs/core/lib/import.lib.php
+++ b/htdocs/core/lib/import.lib.php
@@ -43,11 +43,11 @@ function import_prepare_head($param, $maxstep = 0)
 	$i=1;
 	while($i <= $maxstep)
 	{
-    	$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
-    	$head[$h][1] = $langs->trans("Step")." ".$i;
-    	$head[$h][2] = 'step'.$i;
-    	$h++;
-    	$i++;
+		$head[$h][0] = DOL_URL_ROOT.'/imports/import.php?step='.$i.$param;
+		$head[$h][1] = $langs->trans("Step")." ".$i;
+		$head[$h][2] = 'step'.$i;
+		$h++;
+		$i++;
 	}
 
 	return $head;
diff --git a/htdocs/core/lib/invoice2.lib.php b/htdocs/core/lib/invoice2.lib.php
index 6c31ad826b3..6e79021e17b 100644
--- a/htdocs/core/lib/invoice2.lib.php
+++ b/htdocs/core/lib/invoice2.lib.php
@@ -97,33 +97,33 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 	}
 	if (in_array('nodeposit', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 3';
+		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+		else $sqlwhere.=" AND";
+		$sqlwhere.=' type <> 3';
 	}
 	if (in_array('noreplacement', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 1';
+		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+		else $sqlwhere.=" AND";
+		$sqlwhere.=' type <> 1';
 	}
 	if (in_array('nocreditnote', $filter))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' type <> 2';
+		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+		else $sqlwhere.=" AND";
+		$sqlwhere.=' type <> 2';
 	}
 	if (in_array('excludethirdparties', $filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc NOT IN ('.join(',', $thirdpartiesid).')';
+		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+		else $sqlwhere.=" AND";
+		$sqlwhere.=' f.fk_soc NOT IN ('.join(',', $thirdpartiesid).')';
 	}
 	if (in_array('onlythirdparties', $filter) && is_array($thirdpartiesid))
 	{
-	    if (empty($sqlwhere)) $sqlwhere=' WHERE ';
-	    else $sqlwhere.=" AND";
-	    $sqlwhere.=' f.fk_soc IN ('.join(',', $thirdpartiesid).')';
+		if (empty($sqlwhere)) $sqlwhere=' WHERE ';
+		else $sqlwhere.=" AND";
+		$sqlwhere.=' f.fk_soc IN ('.join(',', $thirdpartiesid).')';
 	}
 	if ($sqlwhere) $sql.=$sqlwhere;
 	if ($sqlorder) $sql.=$sqlorder;
@@ -143,20 +143,20 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 	dol_syslog("scripts/invoices/rebuild_merge.php", LOG_DEBUG);
 	if ( $resql=$db->query($sql) )
 	{
-	    $num = $db->num_rows($resql);
-	    $cpt = 0;
-	    $oldemail = '';
-	    $message = '';
-	    $total = '';
+		$num = $db->num_rows($resql);
+		$cpt = 0;
+		$oldemail = '';
+		$message = '';
+		$total = '';
 
-	    if ($num)
-	    {
-	    	// First loop on each resultset to build PDF
-	    	// -----------------------------------------
+		if ($num)
+		{
+			// First loop on each resultset to build PDF
+			// -----------------------------------------
 
-	        while ($cpt < $num)
-	        {
-	            $obj = $db->fetch_object($resql);
+			while ($cpt < $num)
+			{
+				$obj = $db->fetch_object($resql);
 
 				$fac = new Facture($db);
 				$result=$fac->fetch($obj->rowid);
@@ -174,11 +174,11 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 					$filename=$conf->facture->dir_output.'/'.$fac->ref.'/'.$fac->ref.'.pdf';
 					if ($regenerate || ! dol_is_file($filename))
 					{
-	            	    if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
-	    				$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
+						if ($usestdout) print "Build PDF for invoice ".$obj->ref." - Lang = ".$outputlangs->defaultlang."\n";
+						$result= $fac->generateDocument($regenerate?$regenerate:$fac->modelpdf, $outputlangs);
 					}
 					else {
-					    if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
+						if ($usestdout) print "PDF for invoice ".$obj->ref." already exists\n";
 					}
 
 					// Add file into files array
@@ -192,50 +192,50 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 					else dol_syslog("Failed to build PDF for invoice ".($fac->ref?$fac->ref:' id '.$obj->rowid), LOG_ERR);
 				}
 
-	            $cpt++;
-	        }
+				$cpt++;
+			}
 
 
-	        // Define format of output PDF
-	        $formatarray=pdf_getFormat($langs);
-	        $page_largeur = $formatarray['width'];
-	        $page_hauteur = $formatarray['height'];
-	        $format = array($page_largeur,$page_hauteur);
+			// Define format of output PDF
+			$formatarray=pdf_getFormat($langs);
+			$page_largeur = $formatarray['width'];
+			$page_hauteur = $formatarray['height'];
+			$format = array($page_largeur,$page_hauteur);
 
-	        if ($usestdout) print "Using output PDF format ".join('x', $format)."\n";
-	        else dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);
+			if ($usestdout) print "Using output PDF format ".join('x', $format)."\n";
+			else dol_syslog("Using output PDF format ".join('x', $format), LOG_ERR);
 
 
-	        // Now, build a merged files with all files in $files array
+			// Now, build a merged files with all files in $files array
 			//---------------------------------------------------------
 
-	        // Create empty PDF
-	        $pdf=pdf_getInstance($format);
-	        if (class_exists('TCPDF'))
-	        {
-	            $pdf->setPrintHeader(false);
-	            $pdf->setPrintFooter(false);
-	        }
-	        $pdf->SetFont(pdf_getPDFFont($langs));
+			// Create empty PDF
+			$pdf=pdf_getInstance($format);
+			if (class_exists('TCPDF'))
+			{
+				$pdf->setPrintHeader(false);
+				$pdf->setPrintFooter(false);
+			}
+			$pdf->SetFont(pdf_getPDFFont($langs));
 
-	        if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
+			if ($conf->global->MAIN_DISABLE_PDF_COMPRESSION) $pdf->SetCompression(false);
 			//$pdf->SetCompression(false);
 
 			// Add all others
 			foreach($files as $file)
 			{
-	            if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
-	            else dol_syslog("Merge PDF file for invoice ".$file);
+				if ($usestdout) print "Merge PDF file for invoice ".$file."\n";
+				else dol_syslog("Merge PDF file for invoice ".$file);
 
 				// Charge un document PDF depuis un fichier.
 				$pagecount = $pdf->setSourceFile($file);
 				for ($i = 1; $i <= $pagecount; $i++)
-	            {
-	                 $tplidx = $pdf->importPage($i);
-	                 $s = $pdf->getTemplatesize($tplidx);
-	                 $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
-	                 $pdf->useTemplate($tplidx);
-	            }
+				{
+					 $tplidx = $pdf->importPage($i);
+					 $s = $pdf->getTemplatesize($tplidx);
+					 $pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+					 $pdf->useTemplate($tplidx);
+				}
 			}
 
 			// Create output dir if not exists
@@ -261,19 +261,19 @@ function rebuild_merge_pdf($db, $langs, $conf, $diroutputpdf, $newlangid, $filte
 			}
 
 			$result = 1;
-	    }
-	    else
-	    {
-	        if ($usestdout) print "No invoices found for criteria.\n";
-	        else dol_syslog("No invoices found for criteria");
-	        $result = 0;
-	    }
+		}
+		else
+		{
+			if ($usestdout) print "No invoices found for criteria.\n";
+			else dol_syslog("No invoices found for criteria");
+			$result = 0;
+		}
 	}
 	else
 	{
-	    dol_print_error($db);
-	    dol_syslog("scripts/invoices/rebuild_merge.php: Error");
-	    $error++;
+		dol_print_error($db);
+		dol_syslog("scripts/invoices/rebuild_merge.php: Error");
+		$error++;
 	}
 
 	if ($error) return -1;
diff --git a/htdocs/core/lib/mailmanspip.lib.php b/htdocs/core/lib/mailmanspip.lib.php
index 832bfcbfc7f..e3e81f25aeb 100644
--- a/htdocs/core/lib/mailmanspip.lib.php
+++ b/htdocs/core/lib/mailmanspip.lib.php
@@ -28,18 +28,18 @@
  */
 function mailmanspip_admin_prepare_head()
 {
-    global $langs;
+	global $langs;
 
-    return array(
-        array(
-            DOL_URL_ROOT.'/admin/mailman.php',
-            $langs->trans('Mailman'),
-            'mailman'
-        ),
-        array(
-            DOL_URL_ROOT.'/admin/spip.php',
-            $langs->trans('SPIP'),
-            'spip'
-        )
-    );
+	return array(
+		array(
+			DOL_URL_ROOT.'/admin/mailman.php',
+			$langs->trans('Mailman'),
+			'mailman'
+		),
+		array(
+			DOL_URL_ROOT.'/admin/spip.php',
+			$langs->trans('SPIP'),
+			'spip'
+		)
+	);
 }
diff --git a/htdocs/core/lib/prelevement.lib.php b/htdocs/core/lib/prelevement.lib.php
index 6cdfa4b0b6f..035f0adb754 100644
--- a/htdocs/core/lib/prelevement.lib.php
+++ b/htdocs/core/lib/prelevement.lib.php
@@ -59,15 +59,15 @@ function prelevement_prepare_head(BonPrelevement $object)
 	$head[$h][2] = 'statistics';
 	$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, 'prelevement');
+	// 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, 'prelevement');
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'prelevement', 'remove');
 
-    return $head;
+	return $head;
 }
 
 /**
@@ -80,6 +80,6 @@ function prelevement_check_config()
 	global $conf;
 	if(empty($conf->global->PRELEVEMENT_ID_BANKACCOUNT)) return -1;
 	if(empty($conf->global->PRELEVEMENT_ICS)) return -1;
-    if(empty($conf->global->PRELEVEMENT_USER)) return -1;
+	if(empty($conf->global->PRELEVEMENT_USER)) return -1;
 	return 0;
 }
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index ee80a525f04..e5550f9ddd0 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -358,7 +358,7 @@ function project_admin_prepare_head()
  */
 function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$taskrole, $projectsListId = '', $addordertick = 0, $projectidfortotallink = 0, $filterprogresscalc = '', $showbilltime = 0)
 {
-	global $user, $bc, $langs, $conf, $db;
+	global $user, $langs, $conf, $db;
 	global $projectstatic, $taskstatic;
 
 	$lastprojectid = 0;
@@ -450,7 +450,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					$lastprojectid = $lines[$i]->fk_project;
 				}
 
-				print '<tr '.$bc[$var].' id="row-'.$lines[$i]->id.'">'."\n";
+				print '<tr class="oddeven" id="row-'.$lines[$i]->id.'">'."\n";
 
 				$projectstatic->id = $lines[$i]->fk_project;
 				$projectstatic->ref = $lines[$i]->projectref;
@@ -758,7 +758,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
  */
 function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0)
 {
-	global $conf, $db, $user, $bc, $langs;
+	global $conf, $db, $user, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
 	$lastprojectid = 0;
@@ -830,7 +830,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
 
 			if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 			{
-				print '<tr class="oddeven trforbreak">'."\n";
+				print '<tr class="oddeven trforbreak nobold">'."\n";
 				print '<td colspan="11">';
 				print $projectstatic->getNomUrl(1, '', 0, $langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]);
 				if ($projectstatic->title)
@@ -986,7 +986,7 @@ function projectLinesPerAction(&$inc, $parent, $fuser, $lines, &$level, &$projec
  */
 function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, $preselectedday, &$isavailable, $oldprojectforbreak = 0, $arrayfields = array(), $extrafields = null)
 {
-	global $conf, $db, $user, $bc, $langs;
+	global $conf, $db, $user, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
 	$lastprojectid = 0;
@@ -1073,7 +1073,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
                         if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
                     }
 
-					print '<tr class="oddeven trforbreak">'."\n";
+					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(7 + $addcolspan).'">';
 					print $projectstatic->getNomUrl(1, '', 0, '<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
 					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
@@ -1177,15 +1177,12 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 				// Ref
 				print '<td>';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
-				print $taskstatic->label;
-				//print "<br>";
-				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+				print '<span class="opacitymedium">'.$taskstatic->label.'</a>';
+				for ($k = 0; $k < $level; $k++) print "</div>";
 				print "</td>\n";
 
                 // TASK extrafields
@@ -1365,7 +1362,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
  */
 function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $arrayfields = array(), $extrafields = null)
 {
-	global $conf, $db, $user, $bc, $langs;
+	global $conf, $db, $user, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
 	$numlines = count($lines);
@@ -1452,7 +1449,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
                         if ($val['checked'] && substr($key, 0, 5) == 'efpt.') $addcolspan++;
                     }
 
-					print '<tr class="oddeven trforbreak">'."\n";
+					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(11 + $addcolspan).'">';
 					print $projectstatic->getNomUrl(1, '', 0, '<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
 					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
@@ -1556,16 +1553,12 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
-				print $taskstatic->label;
-				//print "<br>";
-				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+				print '<span class="opacitymedium">'.$taskstatic->label.'</span>';
+				for ($k = 0; $k < $level; $k++) print "</div>";
 				print "</td>\n";
 
 				// TASK extrafields
@@ -1732,7 +1725,7 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$
  */
 function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$level, &$projectsrole, &$tasksrole, $mine, $restricteditformytask, &$isavailable, $oldprojectforbreak = 0, $TWeek = array())
 {
-	global $conf, $db, $user, $bc, $langs;
+	global $conf, $db, $user, $langs;
 	global $form, $formother, $projectstatic, $taskstatic, $thirdpartystatic;
 
 	$numlines = count($lines);
@@ -1804,7 +1797,7 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 
 				if (empty($oldprojectforbreak) || ($oldprojectforbreak != -1 && $oldprojectforbreak != $projectstatic->id))
 				{
-					print '<tr class="oddeven trforbreak">'."\n";
+					print '<tr class="oddeven trforbreak nobold">'."\n";
 					print '<td colspan="'.(6 + count($TWeek)).'">';
 					print $projectstatic->getNomUrl(1, '', 0, '<strong>'.$langs->transnoentitiesnoconv("YourRole").':</strong> '.$projectsrole[$lines[$i]->fk_project]);
 					if ($thirdpartystatic->id > 0) print ' - '.$thirdpartystatic->getNomUrl(1);
@@ -1840,16 +1833,12 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 				// Ref
 				print '<td class="nowrap">';
 				print '<!-- Task id = '.$lines[$i]->id.' -->';
-				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
+				for ($k = 0; $k < $level; $k++) print '<div class="marginleftonly">';
 				print $taskstatic->getNomUrl(1, 'withproject', 'time');
 				// Label task
 				print '<br>';
-				for ($k = 0; $k < $level; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print $taskstatic->getNomUrl(0, 'withproject', 'time');
-				print $taskstatic->label;
-				//print "<br>";
-				//for ($k = 0 ; $k < $level ; $k++) print "&nbsp;&nbsp;&nbsp;";
-				//print get_date_range($lines[$i]->date_start,$lines[$i]->date_end,'',$langs,0);
+				print '<span class="opacitymedium">'.$taskstatic->label.'</span>';
+				for ($k = 0; $k < $level; $k++) print "</div>";
 				print "</td>\n";
 
 				// Planned Workload
@@ -1917,16 +1906,16 @@ function projectLinesPerMonth(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &
 					$alttitle = $langs->trans("AddHereTimeSpentForWeek", $weekNb);
 
 
-					$tableCell = '<td align="center" class="hide">';
+					$tableCell = '<td class="center hide weekend">';
 					$placeholder = '';
 					if ($alreadyspent)
 					{
-						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.$weekNb.']" name="task['.$lines[$i]->id.']['.$weekNb.']" value="'.$alreadyspent.'"></span>';
+						$tableCell .= '<span class="timesheetalreadyrecorded" title="texttoreplace"><input type="text" class="center smallpadd" size="2" disabled id="timespent['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$weekNb.']" value="'.$alreadyspent.'"></span>';
 						//$placeholder=' placeholder="00:00"';
 						//$tableCell.='+';
 					}
 
-					$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.$TFirstDay[$weekNb].']" name="task['.$lines[$i]->id.']['.$TFirstDay[$weekNb].']" value="" cols="2"  maxlength="5"';
+					$tableCell .= '<input type="text" alt="'.($disabledtask ? '' : $alttitle).'" title="'.($disabledtask ? '' : $alttitle).'" '.($disabledtask ? 'disabled' : $placeholder).' class="center smallpadd" size="2" id="timeadded['.$inc.']['.((int) $weekNb).']" name="task['.$lines[$i]->id.']['.$TFirstDay[$weekNb].']" value="" cols="2"  maxlength="5"';
 					$tableCell .= ' onkeypress="return regexEvent(this,event,\'timeChar\')"';
 					$tableCell .= ' onkeyup="updateTotal('.$weekNb.',\''.$modeinput.'\')"';
 					$tableCell .= ' onblur="regexEvent(this,event,\''.$modeinput.'\'); updateTotal('.$weekNb.',\''.$modeinput.'\')" />';
@@ -2029,7 +2018,7 @@ function searchTaskInChild(&$inc, $parent, &$lines, &$taskrole)
  */
 function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks = 0, $status = -1, $listofoppstatus = array(), $hiddenfields = array())
 {
-	global $langs, $conf, $user, $bc;
+	global $langs, $conf, $user;
 	global $theme_datacolor;
 
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
diff --git a/htdocs/core/lib/receiptprinter.lib.php b/htdocs/core/lib/receiptprinter.lib.php
index a7451d0953c..e5589f30707 100644
--- a/htdocs/core/lib/receiptprinter.lib.php
+++ b/htdocs/core/lib/receiptprinter.lib.php
@@ -32,39 +32,39 @@
  */
 function receiptprinteradmin_prepare_head($mode)
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=config";
-    $head[$h][1] = $langs->trans("ListPrinters");
-    $head[$h][2] = 'config';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=config";
+	$head[$h][1] = $langs->trans("ListPrinters");
+	$head[$h][2] = 'config';
+	$h++;
 
-    $head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=template";
-    $head[$h][1] = $langs->trans("SetupReceiptTemplate");
-    $head[$h][2] = 'template';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=template";
+	$head[$h][1] = $langs->trans("SetupReceiptTemplate");
+	$head[$h][2] = 'template';
+	$h++;
 
-    if ($mode == 'test')
-    {
-        $head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=test";
-        $head[$h][1] = $langs->trans("TargetedPrinter");
-        $head[$h][2] = 'test';
-        $h++;
-    }
+	if ($mode == 'test')
+	{
+		$head[$h][0] = DOL_URL_ROOT."/admin/receiptprinter.php?mode=test";
+		$head[$h][1] = $langs->trans("TargetedPrinter");
+		$head[$h][2] = 'test';
+		$h++;
+	}
 
 
-    //$object=new stdClass();
+	//$object=new stdClass();
 
-    // 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,'printingadmin');
+	// 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,'printingadmin');
 
-    //complete_head_from_modules($conf,$langs,$object,$head,$h,'printing','remove');
+	//complete_head_from_modules($conf,$langs,$object,$head,$h,'printing','remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/core/lib/trip.lib.php b/htdocs/core/lib/trip.lib.php
index 5535df7d63f..cb54b263a00 100644
--- a/htdocs/core/lib/trip.lib.php
+++ b/htdocs/core/lib/trip.lib.php
@@ -41,8 +41,8 @@ function trip_prepare_head(Deplacement $object)
 
 	// 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
+	// $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, 'trip');
 
 	$head[$h][0] = DOL_URL_ROOT.'/compta/deplacement/document.php?id='.$object->id;
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index a6fc287d0cf..2b510373299 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -942,6 +942,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	    print '<tr class="oddeven">';
 	    print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
 	    print '<td colspan="'.($colspan - 1).'">';
+	    //print ajax_constantonoff("MAIN_OPTIMIZEFORTEXTBROWSER", array(), null, 0, 0, 1, 0);
    	    if ($edit)
    	    {
    	        print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index 2aa853b4243..0822109d45e 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -710,12 +710,14 @@ function getSocialNetworkSharingLinks()
  * WARNING: This function can be used by websites.
  *
  * @param 	string		$type				Type of container to search into (Example: '', 'page', 'blogpost', 'page,blogpost', ...)
- * @param 	string		$algo				Algorithm used for search (Example: 'meta' is searching into meta information like title and description, 'content', 'sitefiles', or any combination, ...)
+ * @param 	string		$algo				Algorithm used for search (Example: 'meta' is searching into meta information like title and description, 'content', 'sitefiles', or any combination 'meta,content,...')
  * @param	string		$searchstring		Search string
  * @param	int			$max				Max number of answers
+ * @param	string		$sortfield			Sort Fields
+ * @param	string		$sortorder			Sort order ('DESC' or 'ASC')
  * @return  string							HTML content
  */
-function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
+function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $sortfield = 'date_creation', $sortorder = 'DESC')
 {
 	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
 
@@ -778,6 +780,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25)
 		}
 		$sql .= $searchalgo;
 		$sql .= ")";
+		$sql .= $db->order($sortfield, $sortorder);
 		$sql .= $db->plimit($max);
 
 		$resql = $db->query($sql);
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 9748632fb3f..ff0fdcae67e 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -421,7 +421,6 @@ function dolSaveReadme($file, $content)
 function showWebsiteTemplates(Website $website)
 {
 	global $conf, $langs, $db, $form;
-	global $bc;
 
 	$dirthemes = array('/doctemplates/websites');
 	if (!empty($conf->modules_parts['websitetemplates']))		// Using this feature slow down application
@@ -521,21 +520,3 @@ function showWebsiteTemplates(Website $website)
 	print '</td></tr>';
 	print '</table>';
 }
-
-
-
-/**
- * Return HTML content to add structured data for an article, news or Blog Post.
- *
- * @return  string							HTML content
- */
-function getRSSForBlogPosts()
-{
-	global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $websitepage, $weblangs; // Very important. Required to have var available when running inluded containers.
-
-
-
-	return $out;
-}
-
-
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 66ed948585f..02d97e34ee6 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -158,6 +158,11 @@ 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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 6, __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->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;viewstatut=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 7, __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->commande->enabled', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?mainmenu=commercial&amp;leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__);
+-- Commercial - Supplier's proposals
+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->supplier_proposal->enabled', __HANDLER__, 'left', 1600__+MAX_llx_menu__, 'commercial', 'propals_supplier', 3__+MAX_llx_menu__, '/supplier_proposal/index.php?leftmenu=propals_supplier', 'SupplierProposalsShort', 0, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 4, __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->supplier_proposal->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'commercial', '', 1600__+MAX_llx_menu__, '/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals', 'SupplierProposalNew', 1, 'supplier_proposal', '$user->rights->supplier_proposal->creer', '', 2, 0, __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->supplier_proposal->enabled', __HANDLER__, 'left', 1602__+MAX_llx_menu__, 'commercial', '', 1600__+MAX_llx_menu__, '/supplier_proposal/list.php?leftmenu=supplier_proposals', 'List', 1, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 1, __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->supplier_proposal->enabled', __HANDLER__, 'left', 1610__+MAX_llx_menu__, 'commercial', '', 1600__+MAX_llx_menu__, '/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier', 'Statistics', 1, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 2, __ENTITY__);
 -- Commercial - Supplier's orders
 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->supplier_order->enabled', __HANDLER__, 'left', 5100__+MAX_llx_menu__, 'commercial', 'orders_suppliers', 5__+MAX_llx_menu__, '/fourn/commande/index.php?mainmenu=commercial&amp;leftmenu=orders_suppliers', 'SuppliersOrders', 0, 'orders', '$user->rights->fournisseur->commande->lire', '', 2, 6, __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->supplier_order->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=orders_suppliers', 'NewOrder', 1, 'orders', '$user->rights->fournisseur->commande->creer', '', 2, 0, __ENTITY__);
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index eafbdaf5ddd..42b15114379 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -936,6 +936,16 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
                 $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
             }
 
+			// Supplier proposal
+			if (!empty($conf->supplier_proposal->enabled))
+			{
+				$langs->load("supplier_proposal");
+				$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300);
+				$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->rights->supplier_proposal->creer);
+				$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->rights->supplier_proposal->lire);
+				$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->supplier_proposal->lire);
+			}
+
 			// Suppliers orders
             if (!empty($conf->supplier_order->enabled))
 			{
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 278e53eef6e..9ea058de919 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -2256,4 +2256,63 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
     {
         return $this->_remove(array(), $options);
     }
+
+
+    /**
+     * Return Kanban view of a module
+     *
+     * @return string		HTML code of Kanban view
+     */
+    public function getKanbanView()
+    {
+    	global $conf, $langs;
+
+    	// Define imginfo
+    	$imginfo = "info";
+    	if ($this->isCoreOrExternalModule() == 'external')
+    	{
+    		$imginfo = "info_black";
+    	}
+
+    	$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($this)));
+
+    	// Activate/Disable and Setup (2 columns)
+    	if (!empty($conf->global->$const_name))	// If module is already activated
+    	{
+    		$disableSetup = 0;
+    	} else {
+			// TODO
+    	}
+
+		print '
+    	<div class="box-flex-item info-box-module">
+	    <div class="info-box info-box-sm info-box-weather info-box-weather-level4">
+	    <span class="info-box-icon">';
+
+		$alttext = '';
+		//if (is_array($objMod->need_dolibarr_version)) $alttext.=($alttext?' - ':'').'Dolibarr >= '.join('.',$objMod->need_dolibarr_version);
+		//if (is_array($objMod->phpmin)) $alttext.=($alttext?' - ':'').'PHP >= '.join('.',$objMod->phpmin);
+		if (!empty($this->picto))
+		{
+			if (preg_match('/^\//i', $this->picto)) print img_picto($alttext, $this->picto, 'class="inline-block valignmiddle width50"', 1);
+			else print img_object($alttext, $this->picto, 'class="inline-block valignmiddle width50"');
+		}
+		else
+		{
+			print img_object($alttext, 'generic', 'class="inline-block valignmiddle width50"');
+		}
+
+	    print '<img src="/dolibarr_dev/htdocs/theme/eldy/img/weather/weather-storm.png" alt="" class="inline-block valignmiddle width50"></span>
+	    <div class="info-box-content info-box-text-module">
+	    <span class="info-box-title">'.$this->getName().'</span>
+	    <span class="info-box-desc twolinesmax">'.nl2br($this->getDesc()).'</span>';
+
+		print '<a href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.$this->numero.'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto($langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+
+		print '
+	    <span class="progress-description"><span class="opacitymedium">'.$this->getVersion(1).'</span></span>
+	    </div><!-- /.info-box-content -->
+	    </div><!-- /.info-box -->
+	    </div>';
+    }
 }
diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php
index c4c38898566..011448395ae 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -38,9 +38,9 @@ class modDav extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-        global $langs,$conf;
+		global $langs,$conf;
 
-        $this->db = $db;
+		$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).
@@ -116,13 +116,13 @@ class modDav extends DolibarrModules
 
 
 		// Array to add new pages in new tabs
-        $this->tabs = array();
+		$this->tabs = array();
 		// Example:
 		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@dav:$user->rights->dav->read:/dav/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
-        // $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@dav:$user->rights->othermodule->read:/dav/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
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@dav:$user->rights->othermodule->read:/dav/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
@@ -144,9 +144,9 @@ class modDav extends DolibarrModules
 		// 'user'             to add a tab in user view
 
 
-        // Dictionaries
+		// Dictionaries
 		$this->dictionaries=array();
-        /* Example:
+		/* Example:
         $this->dictionaries=array(
             'langs'=>'mylangfile@dav',
             'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
@@ -162,13 +162,13 @@ class modDav extends DolibarrModules
         */
 
 
-        // Boxes/Widgets
+		// Boxes/Widgets
 		// Add here list of php file(s) stored in dav/core/boxes that contains class to show a widget.
-        $this->boxes = array(
-        	//0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
-        	//1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
-        	//2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
-        );
+		$this->boxes = array(
+			//0=>array('file'=>'davwidget1.php@dav','note'=>'Widget provided by dav','enabledbydefaulton'=>'Home'),
+			//1=>array('file'=>'davwidget2.php@dav','note'=>'Widget provided by dav'),
+			//2=>array('file'=>'davwidget3.php@dav','note'=>'Widget provided by dav')
+		);
 
 
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
@@ -262,7 +262,7 @@ class modDav 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/modExport.class.php b/htdocs/core/modules/modExport.class.php
index fb066ef2057..cc0a4eba23c 100644
--- a/htdocs/core/modules/modExport.class.php
+++ b/htdocs/core/modules/modExport.class.php
@@ -45,7 +45,7 @@ class modExport extends DolibarrModules
 
 		$this->family = "technic";
 		$this->module_position = '72';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		// 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 = "Outils d'exports de donnees Dolibarr (via un assistant)";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 45a89032fa6..d35b5441468 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -51,7 +51,7 @@ class modHRM extends DolibarrModules
 		$this->version = 'development';
 
 		$this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
-	    // Name of image file used for this module.
+		// 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='generic';
diff --git a/htdocs/core/modules/modImport.class.php b/htdocs/core/modules/modImport.class.php
index c725660f239..3136d1554b0 100644
--- a/htdocs/core/modules/modImport.class.php
+++ b/htdocs/core/modules/modImport.class.php
@@ -44,8 +44,8 @@ class modImport extends DolibarrModules
 		$this->numero = 250;
 
 		$this->family = "technic";
-        $this->module_position = '70';
-        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+		$this->module_position = '70';
+		// 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 = "Outils d'imports de donnees Dolibarr (via un assistant)";
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
diff --git a/htdocs/core/modules/modMargin.class.php b/htdocs/core/modules/modMargin.class.php
index aca3f4686e5..226585010d0 100644
--- a/htdocs/core/modules/modMargin.class.php
+++ b/htdocs/core/modules/modMargin.class.php
@@ -105,17 +105,17 @@ class modMargin extends DolibarrModules
 		// left menu entry
 		$this->menu[$r]=array(
 				'fk_menu'=>'fk_mainmenu=billing',			// Put 0 if this is a top menu
-    			'type'=>'left',			// This is a Top menu entry
-    			'titre'=>'Margins',
-    			'mainmenu'=>'billing',
-    			'leftmenu'=>'margins',
-    			'url'=>'/margin/index.php',
-    			'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-    			'position'=>100,
-    			'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
-    			'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
-    			'target'=>'',
-    			'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
+				'type'=>'left',			// This is a Top menu entry
+				'titre'=>'Margins',
+				'mainmenu'=>'billing',
+				'leftmenu'=>'margins',
+				'url'=>'/margin/index.php',
+				'langs'=>'margins',	// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+				'position'=>100,
+				'enabled'=>'$conf->margin->enabled',			// Define condition to show or hide menu entry. Use '$conf->monmodule->enabled' if entry must be visible if module is enabled.
+				'perms'=>'$user->rights->margins->liretous',	// Use 'perms'=>'$user->rights->monmodule->level1->level2' if you want your menu with a permission rules
+				'target'=>'',
+				'user'=>2);				// 0=Menu for internal users, 1=external users, 2=both
 		$r++;
 
 		// Permissions
diff --git a/htdocs/core/modules/modSupplierProposal.class.php b/htdocs/core/modules/modSupplierProposal.class.php
index e2d071ac730..5980ae73bab 100644
--- a/htdocs/core/modules/modSupplierProposal.class.php
+++ b/htdocs/core/modules/modSupplierProposal.class.php
@@ -144,58 +144,6 @@ class modSupplierProposal extends DolibarrModules
  		// Main menu entries
 		$this->menu = array();			// List of menus to add
 		$r=0;
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial',		    // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',			                // This is a Left menu entry
-			'titre'=>'SupplierProposalsShort',
-			'leftmenu'=>'supplier_proposalsubmenu',
-			'url'=>'/supplier_proposal/index.php',
-			'langs'=>'supplier_proposal',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-			'enabled'=>'$conf->supplier_proposal->enabled',  // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-			'perms'=>'$user->rights->supplier_proposal->lire',	// Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
-			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
-            'position'=>300
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-			'type'=>'left',
-			'titre'=>'SupplierProposalNew',
-			'url'=>'/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals',
-			'langs'=>'supplier_proposal',
-			'enabled'=>'$conf->supplier_proposal->enabled',
-			'perms'=>'$user->rights->supplier_proposal->creer',
-			'user'=>2,
-            'position'=>301
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-			'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-			'type'=>'left',
-			'titre'=>'List',
-			'url'=>'/supplier_proposal/list.php?leftmenu=supplier_proposals',
-			'langs'=>'supplier_proposal',
-			'enabled'=>'$conf->supplier_proposal->enabled',
-			'perms'=>'$user->rights->supplier_proposal->lire',
-			'user'=>2,
-            'position'=>302
-		);
-		$r++;
-
-		$this->menu[$r]=array(
-		    'fk_menu'=>'fk_mainmenu=commercial,fk_leftmenu=supplier_proposalsubmenu',
-		    'type'=>'left',
-		    'titre'=>'Statistics',
-		    'url'=>'/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier',
-		    'langs'=>'supplier_proposal',
-		    'enabled'=>'$conf->supplier_proposal->enabled',
-		    'perms'=>'$user->rights->supplier_proposal->lire',
-		    'user'=>2,
-		    'position'=>303
-		);
-		$r++;
 	}
 
 
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index e56f0dffa39..f31a38275f3 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -65,9 +65,9 @@ $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
 $credentials = new Credentials(
-    $conf->global->OAUTH_STRIPE_TEST_ID,
+	$conf->global->OAUTH_STRIPE_TEST_ID,
 	$conf->global->STRIPE_TEST_SECRET_KEY,
-    $currentUri->getAbsoluteUri()
+	$currentUri->getAbsoluteUri()
 );
 
 $requestedpermissionsarray=array();
@@ -99,12 +99,12 @@ $langs->load("oauth");
 
 if ($action == 'delete')
 {
-    $storage->clearToken('StripeTest');
+	$storage->clearToken('StripeTest');
 
-    setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
 
-    header('Location: ' . $backtourl);
-    exit();
+	header('Location: ' . $backtourl);
+	exit();
 }
 
 if (! empty($_GET['code']))     // We are coming from oauth provider page
@@ -113,60 +113,60 @@ if (! empty($_GET['code']))     // We are coming from oauth provider page
 	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
 
 	dol_syslog("We are coming from the oauth provider page");
-    //llxHeader('',$langs->trans("OAuthSetup"));
+	//llxHeader('',$langs->trans("OAuthSetup"));
 
-    //$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-    //print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
 
-    //dol_fiche_head();
-    // retrieve the CSRF state parameter
-    $state = isset($_GET['state']) ? $_GET['state'] : null;
-    //print '<table>';
+	//dol_fiche_head();
+	// retrieve the CSRF state parameter
+	$state = isset($_GET['state']) ? $_GET['state'] : null;
+	//print '<table>';
 
-    // This was a callback request from service, get the token
-    try {
-        //var_dump($_GET['code']);
-        //var_dump($state);
-        //var_dump($apiService);      // OAuth\OAuth2\Service\GitHub
+	// This was a callback request from service, get the token
+	try {
+		//var_dump($_GET['code']);
+		//var_dump($state);
+		//var_dump($apiService);      // OAuth\OAuth2\Service\GitHub
 
-        //$token = $apiService->requestAccessToken($_GET['code'], $state);
-        $token = $apiService->requestAccessToken($_GET['code']);
-        // Github is a service that does not need state to be stored.
-        // Into constructor of GitHub, the call
-        // parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
-        // has not the ending parameter to true like the Google class constructor.
+		//$token = $apiService->requestAccessToken($_GET['code'], $state);
+		$token = $apiService->requestAccessToken($_GET['code']);
+		// Github is a service that does not need state to be stored.
+		// Into constructor of GitHub, the call
+		// parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
+		// has not the ending parameter to true like the Google class constructor.
 
-        setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
+		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs');   // Stored into object managed by class DoliStorage so into table oauth_token
 
-        $backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
-        unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
 
-        header('Location: ' . $backtourl);
-        exit();
-    } catch (Exception $e) {
-        print $e->getMessage();
-    }
+		header('Location: ' . $backtourl);
+		exit();
+	} catch (Exception $e) {
+		print $e->getMessage();
+	}
 }
 else // If entry on page with no parameter, we arrive here
 {
-    $_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
+	$_SESSION["backtourlsavedbeforeoauthjump"]=$backtourl;
 
-    // This may create record into oauth_state before the header redirect.
-    // Creation of record with state in this tables depend on the Provider used (see its constructor).
-    if (GETPOST('state'))
-    {
-        $url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
-    }
-    else
-    {
-        //$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
-    	//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
-    	$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
-    }
+	// This may create record into oauth_state before the header redirect.
+	// Creation of record with state in this tables depend on the Provider used (see its constructor).
+	if (GETPOST('state'))
+	{
+		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
+	}
+	else
+	{
+		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
+		//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
+		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
+	}
 
-    // we go on oauth provider authorization page
-    header('Location: ' . $url);
-    exit();
+	// we go on oauth provider authorization page
+	header('Location: ' . $url);
+	exit();
 }
 
 
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index 488938a725b..9cfc52fc1de 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -190,7 +190,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
 		$extrafields->fetch_name_optionals_label($task->table_element, true);
-		$task->fetch_optionals($task->id);
+		$task->fetch_optionals();
 
 		$resarray = $this->fill_substitutionarray_with_extrafields($task, $resarray, $extrafields, 'task', $outputlangs);
 
diff --git a/htdocs/core/modules/syslog/logHandler.php b/htdocs/core/modules/syslog/logHandler.php
index 39593fc065d..ca213b537cf 100644
--- a/htdocs/core/modules/syslog/logHandler.php
+++ b/htdocs/core/modules/syslog/logHandler.php
@@ -90,7 +90,7 @@ class LogHandler
 	/**
 	 * Set current ident.
 	 *
-     * @param	int		$ident		1=Increase ident of 1, -1=Decrease ident of 1
+	 * @param	int		$ident		1=Increase ident of 1, -1=Decrease ident of 1
 	 * @return 	void
 	 */
 	public function setIdent($ident)
diff --git a/htdocs/core/search.php b/htdocs/core/search.php
index 1408aca1b70..b25b65b1c43 100644
--- a/htdocs/core/search.php
+++ b/htdocs/core/search.php
@@ -125,19 +125,19 @@ if (GETPOST('search_project') != '')
 }
 if (GETPOST('search_task') != '')
 {
-    header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php?mode=search&search_all='.urlencode(GETPOST('search_task')));
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/projet/tasks/list.php?mode=search&search_all='.urlencode(GETPOST('search_task')));
+	exit;
 }
 
 if (GETPOST('search_user') != '')
 {
-    header("Location: ".DOL_URL_ROOT.'/user/list.php?mode=search&sall='.urlencode(GETPOST('search_user')));
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/user/list.php?mode=search&sall='.urlencode(GETPOST('search_user')));
+	exit;
 }
 if (GETPOST('search_group') != '')
 {
-    header("Location: ".DOL_URL_ROOT.'/user/group/list.php?mode=search&sall='.urlencode(GETPOST('search_group')));
-    exit;
+	header("Location: ".DOL_URL_ROOT.'/user/group/list.php?mode=search&sall='.urlencode(GETPOST('search_group')));
+	exit;
 }
 
 
diff --git a/htdocs/core/search_page.php b/htdocs/core/search_page.php
index 194afb86d92..1e25fb1ef7d 100644
--- a/htdocs/core/search_page.php
+++ b/htdocs/core/search_page.php
@@ -71,34 +71,34 @@ $searchform = '';
 
 if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
 {
-    if (! is_object($form)) $form=new Form($db);
-    $selected=-1;
-    $searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
+	if (! is_object($form)) $form=new Form($db);
+	$selected=-1;
+	$searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
 }
 else
 {
-    $usedbyinclude = 1; // Used into next include
+	$usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore', 'int');
 	include DOL_DOCUMENT_ROOT.'/core/ajax/selectsearchbox.php';
 
 	$i=0;
-    $accesskeyalreadyassigned=array();
-    foreach($arrayresult as $key => $val)
-    {
-        $tmp=explode('?', $val['url']);
-        $urlaction=$tmp[0];
-        $keysearch='search_all';
+	$accesskeyalreadyassigned=array();
+	foreach($arrayresult as $key => $val)
+	{
+		$tmp=explode('?', $val['url']);
+		$urlaction=$tmp[0];
+		$keysearch='search_all';
 
-        $accesskey='';
-        if (! $accesskeyalreadyassigned[$val['label'][0]])
-        {
-            $accesskey=$val['label'][0];
-            $accesskeyalreadyassigned[$accesskey]=$accesskey;
-        }
-        $searchform.=printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, img_picto('', $val['img'], '', 0, 1), $showtitlebefore, ($i>0?0:1));
+		$accesskey='';
+		if (! $accesskeyalreadyassigned[$val['label'][0]])
+		{
+			$accesskey=$val['label'][0];
+			$accesskeyalreadyassigned[$accesskey]=$accesskey;
+		}
+		$searchform.=printSearchForm($urlaction, $urlaction, $val['label'], 'minwidth200', $keysearch, $accesskey, $key, img_picto('', $val['img'], '', 0, 1), $showtitlebefore, ($i>0?0:1));
 
-        $i++;
-    }
+		$i++;
+	}
 }
 
 // Execute hook printSearchForm
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index 0b73d95a140..e9afad3b48b 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -550,15 +550,15 @@ if ($num > 0)
 		$backtourl = urlencode($_SERVER["PHP_SELF"].'?'.$param.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : ''));
 		if ($user->rights->cron->create)
 		{
-			print "<a href=\"".DOL_URL_ROOT."/cron/card.php?id=".$obj->rowid."&action=edit".($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
+			print '<a class="editfielda" href="'.DOL_URL_ROOT."/cron/card.php?id=".$obj->rowid."&action=edit".($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
 			print "&backtourl=".$backtourl."\" title=\"".dol_escape_htmltag($langs->trans('Edit'))."\">".img_picto($langs->trans('Edit'), 'edit')."</a> &nbsp;";
 		}
 		if ($user->rights->cron->delete)
 		{
 			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"]."?id=".$obj->rowid."&action=delete".($page ? '&page='.$page : '').($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').$param;
-			print "\" title=\"".dol_escape_htmltag($langs->trans('CronDelete'))."\">".img_picto($langs->trans('CronDelete'), 'delete')."</a> &nbsp;";
+			print "\" title=\"".dol_escape_htmltag($langs->trans('CronDelete'))."\">".img_picto($langs->trans('CronDelete'), 'delete', '', false, 0, 0, '', 'marginleftonly')."</a> &nbsp; ";
 		} else {
-			print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'), 'delete')."</a> &nbsp; ";
+			print "<a href=\"#\" title=\"".dol_escape_htmltag($langs->trans('NotEnoughPermissions'))."\">".img_picto($langs->trans('NotEnoughPermissions'), 'delete', '', false, 0, 0, '', 'marginleftonly')."</a> &nbsp; ";
 		}
 		if ($user->rights->cron->execute)
 		{
@@ -567,12 +567,12 @@ if ($num > 0)
 				print (empty($conf->global->CRON_KEY) ? '' : '&securitykey='.$conf->global->CRON_KEY);
 				print ($sortfield ? '&sortfield='.$sortfield : '');
 				print ($sortorder ? '&sortorder='.$sortorder : '');
-				print $param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'), "play").'</a>';
+				print $param."\" title=\"".dol_escape_htmltag($langs->trans('CronExecute'))."\">".img_picto($langs->trans('CronExecute'), "play", '', false, 0, 0, '', 'marginleftonly').'</a>';
 			} else {
-				print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'), "playdisabled").'</a>';
+				print '<a href="#" class="cursordefault" title="'.dol_escape_htmltag($langs->trans('JobDisabled')).'">'.img_picto($langs->trans('JobDisabled'), "playdisabled", '', false, 0, 0, '', 'marginleftonly').'</a>';
 			}
 		} else {
-			print '<a href="#" class="cursornotallowed" title="'.dol_escape_htmltag($langs->trans('NotEnoughPermissions')).'">'.img_picto($langs->trans('NotEnoughPermissions'), "playdisabled").'</a>';
+			print '<a href="#" class="cursornotallowed" title="'.dol_escape_htmltag($langs->trans('NotEnoughPermissions')).'">'.img_picto($langs->trans('NotEnoughPermissions'), "playdisabled", '', false, 0, 0, '', 'marginleftonly').'</a>';
 		}
 		if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 		{
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index 790b69847d7..dbb55a71b52 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -34,13 +34,13 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $formadmin = new FormAdmin($db);
 
 if (GETPOST('l')) {
-    $l = GETPOST('l');
+	$l = GETPOST('l');
 } else {
-    $l = $langs->defaultlang;
+	$l = $langs->defaultlang;
 }
 // Access control
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 /*
  * Actions
@@ -49,28 +49,28 @@ if (!$user->admin)
 include DOL_DOCUMENT_ROOT . '/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'setvalue' && $user->admin) {
-    $db->begin();
-    $sub = "DATAPOLICIESSUBJECT_" . $l;
-    $result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
-    $cont = "DATAPOLICIESCONTENT_" . $l;
-    $result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
-    $cont = "TXTLINKDATAPOLICIESACCEPT_" . $l;
-    $result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
-    $cont = "TXTLINKDATAPOLICIESREFUSE_" . $l;
-    $result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
-    $sub = "DATAPOLICIESACCEPT_" . $l;
-    $result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
-    $sub = "DATAPOLICIESREFUSE_" . $l;
-    $result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
-    if (!$result > 0)
-        $error++;
-    if (!$error) {
-        $db->commit();
-        setEventMessage($langs->trans("SetupSaved"));
-    } else {
-        $db->rollback();
-        dol_print_error($db);
-    }
+	$db->begin();
+	$sub = "DATAPOLICIESSUBJECT_" . $l;
+	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
+	$cont = "DATAPOLICIESCONTENT_" . $l;
+	$result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
+	$cont = "TXTLINKDATAPOLICIESACCEPT_" . $l;
+	$result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
+	$cont = "TXTLINKDATAPOLICIESREFUSE_" . $l;
+	$result = dolibarr_set_const($db, $cont, GETPOST($cont), 'chaine', 0, '', $conf->entity);
+	$sub = "DATAPOLICIESACCEPT_" . $l;
+	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
+	$sub = "DATAPOLICIESREFUSE_" . $l;
+	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0)
+		$error++;
+	if (!$error) {
+		$db->commit();
+		setEventMessage($langs->trans("SetupSaved"));
+	} else {
+		$db->rollback();
+		dol_print_error($db);
+	}
 }
 
 
@@ -105,9 +105,9 @@ print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">'
 print '<input type="hidden" name="action" value="setvalue">';
 print '<table>';
 if ($conf->global->MAIN_MULTILANGS) {
-    print '<tr><td>' . $form->editfieldkey('DefaultLang', 'default_lang', '', null, 0) . '</td><td colspan="3" class="maxwidthonsmartphone">' . "\n";
-    print $formadmin->select_language((GETPOST('l') ? GETPOST('l') : $langs->defaultlang), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
-    print '</tr>';
+	print '<tr><td>' . $form->editfieldkey('DefaultLang', 'default_lang', '', null, 0) . '</td><td colspan="3" class="maxwidthonsmartphone">' . "\n";
+	print $formadmin->select_language((GETPOST('l') ? GETPOST('l') : $langs->defaultlang), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
+	print '</tr>';
 }
 $subject = 'DATAPOLICIESSUBJECT_' . $l;
 $linka = 'TXTLINKDATAPOLICIESACCEPT_' . $l;
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index 20d44edbd83..5330bb71215 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -76,9 +76,9 @@ dol_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit')
 {
-    print '<div class="tabsAction">';
-    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
-    print "</div>";
+	print '<div class="tabsAction">';
+	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print "</div>";
 }
 
 
@@ -90,10 +90,10 @@ if ($action != 'create' && $action != 'edit')
 
 if ($action == 'create')
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print "<br>";
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -103,10 +103,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index bba65463bb6..faa6693bce8 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -445,7 +445,7 @@ if ($action == 'create')
 	if (!empty($conf->projet->enabled))
     {
         print "<tr><td>".$langs->trans("Project")."</td><td>";
-        $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1);
+        $formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print "</td></tr>\n";
     }
 
@@ -579,7 +579,7 @@ if (!empty($id) && $action == 'edit')
 
         $langs->load('projects');
         print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects(-1, $object->fk_project, 'fk_project', 0, 0, 1, 1);
+		$formproject->select_projects(-1, $object->fk_project, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
         print '</td></tr>';
     }
 
@@ -652,7 +652,7 @@ if (!empty($id) && $action != 'edit')
                 $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.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', 0, 0, 1, 0, 1, 0, 0, '', 1, 0, 'maxwidth500');
                 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
                 $morehtmlref.='</form>';
             } else {
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index 777320a9d96..8260656e4d0 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -178,7 +178,7 @@ class Don extends CommonObject
     	}
 
     	$statusType = 'status'.$status;
-    	if ($status == self::STATUS_CANCELED) $statusType = 'status5';
+    	if ($status == self::STATUS_CANCELED) $statusType = 'status9';
     	if ($status == self::STATUS_PAID) $statusType = 'status6';
 
     	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
diff --git a/htdocs/don/index.php b/htdocs/don/index.php
index 39155dae768..3f74cfa53a1 100644
--- a/htdocs/don/index.php
+++ b/htdocs/don/index.php
@@ -118,6 +118,10 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
     }
 }
 
+$dataseries = array();
+$colorseries = array();
+
+include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
 print '<table class="noborder nohover centpercent">';
 print '<tr class="liste_titre">';
@@ -128,6 +132,10 @@ $listofstatus = array(0, 1, -1, 2);
 foreach ($listofstatus as $status)
 {
     $dataseries[] = array($donstatic->LibStatut($status, 1), (isset($nb[$status]) ? (int) $nb[$status] : 0));
+    if ($status == Don::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+    if ($status == Don::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+    if ($status == Don::STATUS_CANCELED) $colorseries[$status] = $badgeStatus9;
+    if ($status == Don::STATUS_PAID) $colorseries[$status] = $badgeStatus6;
 }
 
 if ($conf->use_javascript_ajax)
@@ -137,6 +145,7 @@ if ($conf->use_javascript_ajax)
     include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
     $dolgraph = new DolGraph();
     $dolgraph->SetData($dataseries);
+    $dolgraph->SetDataColor(array_values($colorseries));
     $dolgraph->setShowLegend(2);
     $dolgraph->setShowPercent(1);
     $dolgraph->SetType(array('pie'));
diff --git a/htdocs/ecm/ajax/ecmdatabase.php b/htdocs/ecm/ajax/ecmdatabase.php
index 7841f17c1c9..754f68a9930 100644
--- a/htdocs/ecm/ajax/ecmdatabase.php
+++ b/htdocs/ecm/ajax/ecmdatabase.php
@@ -162,10 +162,10 @@ if (isset($action) && ! empty($action))
 			}
 		}
 
-	    // Loop now on each sql tree to check if dir exists
-	    foreach($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
-	    {
-	    	$dirtotest=$conf->$element->dir_output.'/'.$dirdesc['fullrelativename'];
+		// Loop now on each sql tree to check if dir exists
+		foreach($sqltree as $dirdesc)    // Loop on each sqltree to check dir is on disk
+		{
+			$dirtotest=$conf->$element->dir_output.'/'.$dirdesc['fullrelativename'];
 			if (! dol_is_dir($dirtotest))
 			{
 				$mesg.=$dirtotest." not found onto disk. We delete from database dir with id=".$dirdesc['id']."<br>\n";
@@ -173,7 +173,7 @@ if (isset($action) && ! empty($action))
 				$ecmdirtmp->delete($user, 'databaseonly');
 				//exit;
 			}
-	    }
+		}
 
 		$sql="UPDATE ".MAIN_DB_PREFIX."ecm_directories set cachenbofdoc = -1 WHERE cachenbofdoc < 0"; // If pb into cahce counting, we set to value -1 = "unknown"
 		dol_syslog("sql = ".$sql);
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index 55aeeda5f90..3793be8a784 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -108,27 +108,27 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']), 0, 0, $_FILES['userfile']['error']);
 		if (is_numeric($resupload) && $resupload > 0)
 		{
-		    $result=$ecmdir->changeNbOfFiles('+');
-	    }
-	    else
-	    {
+			$result=$ecmdir->changeNbOfFiles('+');
+		}
+		else
+		{
    			$langs->load("errors");
 			if ($resupload < 0)	// Unknown error
 			{
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			} elseif (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload)) {
-                // Files infected by a virus
+				// Files infected by a virus
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
 			else	// Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
-	    }
+		}
 	}
 	else
 	{
-	    // Failed transfer (exceeding the limit file?)
+		// Failed transfer (exceeding the limit file?)
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
 	}
@@ -137,13 +137,13 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 // Remove file
 if ($action == 'confirm_deletefile' && $confirm == 'yes')
 {
-    $langs->load("other");
-    $file = $upload_dir . "/" . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
-    $ret=dol_delete_file($file);
-    if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
-    else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
+	$langs->load("other");
+	$file = $upload_dir . "/" . GETPOST('urlfile');	// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+	$ret=dol_delete_file($file);
+	if ($ret) setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
+	else setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
 
-    $result=$ecmdir->changeNbOfFiles('-');
+	$result=$ecmdir->changeNbOfFiles('-');
 }
 
 // Remove dir
@@ -197,21 +197,21 @@ if ($action == 'update' && ! GETPOST('cancel', 'alpha'))
 {
 	$error=0;
 
-    if ($module == 'ecm')
-    {
-    	$oldlabel=$ecmdir->label;
+	if ($module == 'ecm')
+	{
+		$oldlabel=$ecmdir->label;
 		$olddir=$ecmdir->getRelativePath(0);
 		$olddir=$conf->ecm->dir_output.'/'.$olddir;
-    }
-    else
-    {
-    	$olddir=GETPOST('section', 'alpha');
-    	$olddir=$conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
-    }
+	}
+	else
+	{
+		$olddir=GETPOST('section', 'alpha');
+		$olddir=$conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
+	}
 
-    if ($module == 'ecm')
-    {
-    	$db->begin();
+	if ($module == 'ecm')
+	{
+		$db->begin();
 
 		// Fetch was already done
 		$ecmdir->label = dol_sanitizeFileName(GETPOST("label"));
@@ -252,27 +252,27 @@ if ($action == 'update' && ! GETPOST('cancel', 'alpha'))
 			$db->rollback();
 			setEventMessages($ecmdir->error, $ecmdir->errors, 'errors');
 		}
-    }
-    else
-    {
-    	$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
+	}
+	else
+	{
+		$newdir = $conf->medias->multidir_output[$conf->entity].'/'.GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
 
-    	$result=@rename($olddir, $newdir);
-    	if (! $result)
-    	{
-    		$langs->load('errors');
-    		setEventMessages($langs->trans('ErrorFailToRenameDir', $olddir, $newdir), null, 'errors');
-    		$error++;
-    	}
+		$result=@rename($olddir, $newdir);
+		if (! $result)
+		{
+			$langs->load('errors');
+			setEventMessages($langs->trans('ErrorFailToRenameDir', $olddir, $newdir), null, 'errors');
+			$error++;
+		}
 
-    	if (! $error)
-    	{
-    		// Set new value after renaming
-    		$relativepath=GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
-    		$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
-    		$section = $relativepath;
-    	}
-    }
+		if (! $error)
+		{
+			// Set new value after renaming
+			$relativepath=GETPOST('oldrelparentdir', 'alpha').'/'.GETPOST('label', 'alpha');
+			$upload_dir = $conf->medias->multidir_output[$conf->entity].'/'.$relativepath;
+			$section = $relativepath;
+		}
+	}
 }
 
 
@@ -435,7 +435,7 @@ if ($ecmdir->id > 0)
 	// Test if nb is same than in cache
 	if ($nbofiles != $ecmdir->cachenbofdoc)
 	{
-	    $ecmdir->changeNbOfFiles((string) $nbofiles);
+		$ecmdir->changeNbOfFiles((string) $nbofiles);
 	}
 }
 print '</td></tr>';
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index b465297fe34..485e8733ffa 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1574,8 +1574,8 @@ if ($action == 'create')
 						$expLine = new ExpeditionLigne($db);
 
 						$srcLine = new OrderLine($db);
-						$srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline
-						//$line->fetch_optionals($line->id);
+						$srcLine->id = $line->id;
+						$srcLine->fetch_optionals(); // fetch extrafields also available in orderline
 						$line->array_options = array_merge($line->array_options, $srcLine->array_options);
 
 						print $expLine->showOptionals($extrafields, 'edit', array('style'=>'class="drag drop oddeven"', 'colspan'=>$colspan), $indiceAsked, '', 1);
@@ -2012,7 +2012,7 @@ elseif ($id || $ref)
 		if ($action == 'editline')
 		{
 			print '	<form name="updateline" id="updateline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;lineid='.$line_id.'" 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="id" value="' . $object->id.'">
@@ -2460,7 +2460,7 @@ elseif ($id || $ref)
 					if (!empty($conf->stock->enabled)) $colspan++;
 
 					$line = $lines[$i];
-					$line->fetch_optionals($line->id);
+					$line->fetch_optionals();
 
 					if ($action == 'editline' && $line->id == $line_id)
 					{
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 8c60c194c8b..0411004c6d5 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -68,6 +68,7 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
 /*
  * Shipments to validate
  */
+
 $clause = " WHERE ";
 
 $sql = "SELECT e.rowid, e.ref, e.ref_customer,";
@@ -91,12 +92,14 @@ $resql=$db->query($sql);
 if ($resql)
 {
 	$num = $db->num_rows($resql);
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
+
 	if ($num)
 	{
-        print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("SendingsToValidate").'</th></tr>';
 		$i = 0;
 		while ($i < $num)
 		{
@@ -117,132 +120,23 @@ if ($resql)
 			print '</td></tr>';
 			$i++;
 		}
-		print "</table></div><br>";
-	}
-}
-
-
-/*
- * Commandes a traiter
- */
-$sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$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.fk_statut = 1";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " ORDER BY c.rowid ASC";
-
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	if ($num)
+	} else
 	{
-		$langs->load("orders");
-
-		$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("OrdersToProcess").'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			$orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_customer=$obj->ref_customer;
-			$orderstatic->statut=$obj->fk_statut;
-			$orderstatic->billed=0;
-
-			$companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">';
-			print $orderstatic->getNomUrl(1);
-			print '</td>';
-			print '<td>';
-			print $companystatic->getNomUrl(1, 'customer', 32);
-			print '</td>';
-			print '<td class="right">';
-			print $orderstatic->getLibStatut(3);
-			print '</td>';
-			print '</tr>';
-			$i++;
-		}
-		print "</table></div><br>";
+		print '<tr><td>'.$langs->trans("None").'</td><td></td><td></td></tr>';
 	}
+
+	print "</table></div><br>";
 }
 
 
+
 //print '</td><td valign="top" width="70%">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
+$max = 5;
 
 /*
- * Commandes en traitement
- */
-$sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$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.fk_statut = 2";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-
-$resql = $db->query($sql);
-if ( $resql )
-{
-	$langs->load("orders");
-
-	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		$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("OrdersInProcess").'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-		    $orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_customer=$obj->ref_customer;
-			$orderstatic->statut=$obj->status;
-            $orderstatic->billed=$obj->billed;
-
-            $companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-
-			print '<tr class="oddeven"><td>';
-			print $orderstatic->getNomUrl(1);
-			print '</td>';
-			print '<td>';
-			print $companystatic->getNomUrl(1, 'customer');
-			print '</td>';
-            print '<td class="right">';
-            print $orderstatic->getLibStatut(3);
-            print '</td>';
-            print '</tr>';
-			$i++;
-		}
-		print "</table></div><br>";
-	}
-}
-else dol_print_error($db);
-
-
-/*
- * Last shipments
+ * Latest shipments
  */
 $sql = "SELECT e.rowid, e.ref, e.ref_customer,";
 $sql.= " s.nom as name, s.rowid as socid,";
@@ -254,10 +148,10 @@ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = e.fk_soc";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON e.fk_soc = sc.fk_soc";
 $sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user = " .$user->id;
-$sql.= " AND e.fk_statut = 1";
+$sql.= " AND e.fk_statut = ".Expedition::STATUS_VALIDATED;
 if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 $sql.= " ORDER BY e.date_delivery DESC";
-$sql.= $db->plimit(5, 0);
+$sql.= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
 if ($resql)
@@ -266,10 +160,10 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("LastSendings", $num).'</th></tr>';
+		print '<th colspan="4">'.$langs->trans("LastSendings", $num).'</th></tr>';
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
@@ -289,8 +183,11 @@ if ($resql)
 				$orderstatic->ref=$obj->commande_ref;
 				print $orderstatic->getNomUrl(1);
 			}
-			else print '&nbsp;';
-			print '</td></tr>';
+			print '</td>';
+			print '<td class="">';
+
+			print '</td>';
+			print '</tr>';
 			$i++;
 		}
 		print "</table></div><br>";
@@ -299,6 +196,72 @@ if ($resql)
 }
 else dol_print_error($db);
 
+/*
+ * Open orders
+ */
+$sql = "SELECT c.rowid, c.ref, c.ref_client as ref_customer, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
+$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
+$sql.= " ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " AND c.entity IN (".getEntity('order').")";
+$sql.= " AND c.fk_statut IN (".Commande::STATUS_VALIDATED.", ".Commande::STATUS_ACCEPTED.")";
+if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " ORDER BY c.rowid ASC";
+
+$resql = $db->query($sql);
+if ( $resql )
+{
+	$langs->load("orders");
+
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$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("OrdersToProcess").' <span class="badge">'.$num.'</span></th></tr>';
+		while ($i < $num && $i < 10)
+		{
+			$obj = $db->fetch_object($resql);
+
+		    $orderstatic->id=$obj->rowid;
+			$orderstatic->ref=$obj->ref;
+			$orderstatic->ref_customer=$obj->ref_customer;
+			$orderstatic->statut=$obj->status;
+            $orderstatic->billed=$obj->billed;
+
+            $companystatic->name=$obj->name;
+			$companystatic->id=$obj->socid;
+
+			print '<tr class="oddeven"><td>';
+			print $orderstatic->getNomUrl(1);
+			print '</td>';
+			print '<td>';
+			print $companystatic->getNomUrl(1, 'customer', 32);
+			print '</td>';
+            print '<td class="right">';
+            print $orderstatic->getLibStatut(3);
+            print '</td>';
+            print '</tr>';
+			$i++;
+		}
+
+		if ($i < $num) {
+			print '<tr class="opacitymedium">';
+			print '<td>'.$langs->trans("More").'...</td>';
+			print '<td></td>';
+			print '<td></td>';
+			print '</tr>';
+		}
+
+		print "</table></div><br>";
+	}
+}
+else dol_print_error($db);
+
 
 print '</div></div></div>';
 
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index f6642de917f..3204e5361ec 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -341,7 +341,7 @@ print '</table>';
 */
 
 print '<br>';
-print '<i>'.$langs->trans("StatsOnShipmentsOnlyValidated").'</i>';
+print '<i class="opacitymedium">'.$langs->trans("StatsOnShipmentsOnlyValidated").'</i>';
 
 // End of page
 llxFooter();
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index d78ac9e6261..5b15863cc28 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -399,7 +399,7 @@ class ExpenseReport extends CommonObject
 
         // get extrafields so they will be clone
         //foreach($this->lines as $line)
-            //$line->fetch_optionals($line->rowid);
+	        //$line->fetch_optionals();
 
         // Load source object
         $objFrom = clone $this;
diff --git a/htdocs/expensereport/index.html b/htdocs/expensereport/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/expensereport/info.php b/htdocs/expensereport/info.php
index 715530e9199..bb48b8cf70a 100644
--- a/htdocs/expensereport/info.php
+++ b/htdocs/expensereport/info.php
@@ -60,7 +60,7 @@ if ($id > 0 || ! empty($ref))
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref='<div class="refidno">';
-    $morehtmlref.='</div>';
+	$morehtmlref.='</div>';
 
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -71,12 +71,12 @@ if ($id > 0 || ! empty($ref))
 	print '<br>';
 
 	print '<table width="100%"><tr><td>';
-    dol_print_object_info($object);
-    print '</td></tr></table>';
+	dol_print_object_info($object);
+	print '</td></tr></table>';
 
-    print '</div>';
+	print '</div>';
 
-    dol_fiche_end();
+	dol_fiche_end();
 }
 
 // End of page
diff --git a/htdocs/expensereport/note.php b/htdocs/expensereport/note.php
index a5038b32b0e..d01e2a56ba3 100644
--- a/htdocs/expensereport/note.php
+++ b/htdocs/expensereport/note.php
@@ -81,13 +81,13 @@ if ($id > 0 || ! empty($ref))
 	$linkback = '<a href="'.DOL_URL_ROOT.'/expensereport/list.php?restore_lastsearch_values=1'.(! empty($socid)?'&socid='.$socid:'').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref='<div class="refidno">';
-    $morehtmlref.='</div>';
+	$morehtmlref.='</div>';
 
 
 	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>';
 
 	$cssclass="titlefield";
 	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
diff --git a/htdocs/externalsite/admin/externalsite.php b/htdocs/externalsite/admin/externalsite.php
index 92eaeee2188..aedf86927d1 100644
--- a/htdocs/externalsite/admin/externalsite.php
+++ b/htdocs/externalsite/admin/externalsite.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'externalsite'));
@@ -45,26 +45,26 @@ $action = GETPOST('action', 'alpha');
 // Sauvegardes parametres
 if ($action == 'update')
 {
-    $i=0;
+	$i=0;
 
-    $db->begin();
+	$db->begin();
 
 	$label  = GETPOST('EXTERNALSITE_LABEL', 'alpha');
-    $exturl = GETPOST('EXTERNALSITE_URL', 'none');
+	$exturl = GETPOST('EXTERNALSITE_URL', 'none');
 
-    $i+=dolibarr_set_const($db, 'EXTERNALSITE_LABEL', trim($label), 'chaine', 0, '', $conf->entity);
-    $i+=dolibarr_set_const($db, 'EXTERNALSITE_URL', trim($exturl), 'chaine', 0, '', $conf->entity);
+	$i+=dolibarr_set_const($db, 'EXTERNALSITE_LABEL', trim($label), 'chaine', 0, '', $conf->entity);
+	$i+=dolibarr_set_const($db, 'EXTERNALSITE_URL', trim($exturl), 'chaine', 0, '', $conf->entity);
 
-    if ($i >= 2)
-    {
-        $db->commit();
-	    setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-	    setEventMessages($db->lasterror(), null, 'errors');
-    }
+	if ($i >= 2)
+	{
+		$db->commit();
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		$db->rollback();
+		setEventMessages($db->lasterror(), null, 'errors');
+	}
 }
 
 
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 259d8b3b50d..9d68e626613 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -129,7 +129,7 @@ else
 	    <frame name=\"barre\" src=\"frametop.php?mainmenu=".$mainmenu."&leftmenu=".$leftmenu."&idmenu=".$idmenu.($theme?'&theme='.$theme:'').($codelang?'&lang='.$codelang:'')."&nobackground=1\" noresize scrolling=\"NO\" noborder>
 	  ";
 		print '<frame name="main" src="';
-	    print $conf->global->EXTERNALSITE_URL;
+		print $conf->global->EXTERNALSITE_URL;
 		print '">';
 		print "
 	    <noframes>
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 9ccf2cf56f4..b4c4d2c6325 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -79,9 +79,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>";
 }
 
 
@@ -96,7 +96,7 @@ 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';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -106,10 +106,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 llxFooter();
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 7738538fb6b..118e21a841c 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -1183,7 +1183,7 @@ class Fichinter extends CommonObject
 
 		// get extrafields so they will be clone
 		foreach ($this->lines as $line)
-			$line->fetch_optionals($line->rowid);
+			$line->fetch_optionals();
 
 		// Load source object
 		$objFrom = clone $this;
diff --git a/htdocs/fichinter/index.html b/htdocs/fichinter/index.html
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 6bde087fa61..8929da904f3 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -122,16 +122,24 @@ if ($resql)
         $i++;
     }
     $db->free($resql);
+
+    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder nohover centpercent">';
     print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
-    $listofstatus = array(0, 1, 2);
+    $listofstatus = array(0, 1, 3);
     $bool = false;
     foreach ($listofstatus as $status)
     {
         $dataseries[] = array($fichinterstatic->LibStatut($status, $bool, 1), (isset($vals[$status.$bool]) ? (int) $vals[$status.$bool] : 0));
         if ($status == 3 && !$bool) $bool = true;
         else $bool = false;
+
+        if ($status == Fichinter::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+        if ($status == Fichinter::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+        if ($status == Fichinter::STATUS_BILLED) $colorseries[$status] = $badgeStatus4;
+        if ($status == Fichinter::STATUS_CLOSED) $colorseries[$status] = $badgeStatus6;
     }
     if ($conf->use_javascript_ajax)
     {
@@ -140,13 +148,13 @@ if ($resql)
         include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
         $dolgraph = new DolGraph();
         $dolgraph->SetData($dataseries);
+        $dolgraph->SetDataColor(array_values($colorseries));
         $dolgraph->setShowLegend(2);
         $dolgraph->setShowPercent(1);
         $dolgraph->SetType(array('pie'));
         $dolgraph->setHeight('200');
         $dolgraph->draw('idgraphstatus');
         print $dolgraph->show($total ? 0 : 1);
-        $data = array('series'=>$dataseries);
 
         print '</td></tr>';
     }
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index a6f12835420..0697027a027 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -47,8 +47,8 @@ $object = new Fichinter($db);
 
 if (! $object->fetch($id, $ref) > 0)
 {
-    dol_print_error($db);
-    exit;
+	dol_print_error($db);
+	exit;
 }
 
 
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index 797e3693614..9906a679ce1 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -104,6 +104,8 @@ class CommandeFournisseur extends CommonOrder
     //  Note: billed or not is on another field "billed"
     public $statuts; // List of status
 
+    public $billed;
+
     public $socid;
     public $fourn_id;
     public $date;
@@ -354,6 +356,7 @@ class CommandeFournisseur extends CommonOrder
             $this->socid = $obj->fk_soc;
             $this->fourn_id = $obj->fk_soc;
             $this->statut				= $obj->fk_statut;
+            $this->status				= $obj->fk_statut;
             $this->billed				= $obj->billed;
             $this->user_author_id = $obj->fk_user_author;
             $this->user_valid_id = $obj->fk_user_valid;
@@ -694,7 +697,7 @@ class CommandeFournisseur extends CommonOrder
      *  Return label of a status
      *
      * 	@param  int		$status		Id statut
-     *  @param  int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+	 *  @param  int		$mode       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  int     $billed     1=Billed
      *  @return string				Label of status
      */
@@ -731,14 +734,14 @@ class CommandeFournisseur extends CommonOrder
 
         $statustrans = array(
             0 => 'status0',
-            1 => 'status1',
-            2 => 'status3',
-            3 => 'status3',
-            4 => 'status3',
-            5 => 'status4',
-            6 => 'status5',
-            7 => 'status5',
-            9 => 'status5',
+            1 => 'status1b',
+            2 => 'status1',
+            3 => 'status4',
+            4 => 'status4b',
+            5 => 'status6',
+            6 => 'status9',
+            7 => 'status9',
+            9 => 'status9',
         );
 
         $statusClass = 'status0';
@@ -747,9 +750,10 @@ class CommandeFournisseur extends CommonOrder
         }
 
         $billedtext = '';
-        if ($mode == 4 && $billed) {
-            $billedtext = ' - '.$langs->trans("Billed");
+        if ($billed) {
+        	$billedtext = ' - '.$langs->trans("Billed");
         }
+        if ($status == 5 && $billed) $statusClass = 'status6';
 
         $statusLong = $langs->trans($this->statuts[$status]).$billedtext;
         $statusShort = $langs->trans($this->statutshort[$status]);
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index 332e33ece59..07059830e6a 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1,12 +1,13 @@
 <?php
-/* Copyright (C) 2005		Rodolphe Quiedeville	<rodolphe@quiedeville.org>
- * Copyright (C) 2006-2011	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2014	Regis Houssin		<regis.houssin@inodbox.com>
- * Copyright (C) 2011		Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2012		Christophe Battarel	<christophe.battarel@altairis.fr>
- * Copyright (C) 2015		Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2016		Charlie Benke           <charlie@patas-monkey.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+/* Copyright (C) 2005		Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2011	Laurent Destailleur	  <eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2014	Regis Houssin		  <regis.houssin@inodbox.com>
+ * Copyright (C) 2011		Juanjo Menent		  <jmenent@2byte.es>
+ * Copyright (C) 2012		Christophe Battarel	  <christophe.battarel@altairis.fr>
+ * Copyright (C) 2015		Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2016		Charlie Benke         <charlie@patas-monkey.com>
+ * Copyright (C) 2019       Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Pierre Ardoin         <mapiolca@me.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
@@ -605,7 +606,7 @@ class ProductFournisseur extends Product
         global $conf;
 
         $sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
-        $sql .= " pfp.rowid as product_fourn_pri_id, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product as product_fourn_id, pfp.fk_supplier_price_expression,";
+        $sql .= " pfp.rowid as product_fourn_pri_id, pfp.entity, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product as product_fourn_id, pfp.fk_supplier_price_expression,";
         $sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation,";
         $sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code, pfp.datec, pfp.tms,";
         $sql .= " pfp.barcode, pfp.fk_barcode_type";
@@ -632,6 +633,7 @@ class ProductFournisseur extends Product
 
                 $prodfourn->product_fourn_price_id = $record["product_fourn_pri_id"];
                 $prodfourn->product_fourn_id = $record["product_fourn_id"];
+                $prodfourn->product_fourn_entity = $record["entity"];
                 $prodfourn->fourn_ref = $record["ref_fourn"];
                 $prodfourn->ref_supplier			= $record["ref_fourn"];
                 $prodfourn->desc_supplier = $record["desc_fourn"];
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 302cf3b47b7..164b3d2152b 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1192,7 +1192,7 @@ if (empty($reshook))
 								// Extrafields
 								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) 							// For avoid conflicts if
 								{
-									$lines[$i]->fetch_optionals($lines[$i]->rowid);
+									$lines[$i]->fetch_optionals();
 									$array_option = $lines[$i]->array_options;
 								}
 
@@ -1514,7 +1514,7 @@ if ($action == 'create')
 		$objectsrc->fetch_thirdparty();
 
 		// Replicate extrafields
-		$objectsrc->fetch_optionals($originid);
+		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
 
 		$projectid = (!empty($objectsrc->fk_project) ? $objectsrc->fk_project : '');
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 25c4868fd5e..fd14deabb43 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -76,12 +76,12 @@ if (!empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useles
  * Statistics
  */
 
-$sql = "SELECT count(cf.rowid), fk_statut";
+$sql = "SELECT count(cf.rowid) as nb, fk_statut as status";
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 $sql .= " WHERE cf.fk_soc = s.rowid";
-$sql .= " AND cf.entity = ".$conf->entity;
+$sql .= " AND cf.entity IN (".getEntity('supplier_order').")";
 if ($user->socid) $sql .= ' AND cf.fk_soc = '.$user->socid;
 if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
 $sql .= " GROUP BY cf.fk_statut";
@@ -93,7 +93,6 @@ if ($resql)
 	$i = 0;
 
 	$total = 0;
-	$totalinprocess = 0;
 	$dataseries = array();
 	$vals = array();
 	//	0=Draft -> 1=Validated -> 2=Approved -> 3=Process runing -> 4=Received partially -> 5=Received totally -> (reopen) 4=Received partially
@@ -101,27 +100,36 @@ if ($resql)
 	//	-> 6=Canceled -> (reopen) 2=Approved
 	while ($i < $num)
 	{
-		$row = $db->fetch_row($resql);
-		if ($row)
+		$obj = $db->fetch_object($resql);
+		if ($obj)
 		{
-			if ($row[1] != 7 && $row[1] != 6 && $row[1] != 5)
-			{
-				$vals[$row[1]] = $row[0];
-				$totalinprocess += $row[0];
-			}
-			$total += $row[0];
+			$vals[($obj->status == CommandeFournisseur::STATUS_CANCELED_AFTER_ORDER ? CommandeFournisseur::STATUS_CANCELED : $obj->status)] = $obj->nb;
+
+			$total += $obj->nb;
 		}
 		$i++;
 	}
 	$db->free($resql);
 
+	include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder nohover centpercent">';
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").'</th></tr>';
 	print "</tr>\n";
-	foreach (array(0, 1, 2, 3, 4, 5, 6) as $status)
+	$listofstatus=array(0, 1, 2, 3, 4, 5, 6, 9);
+	foreach ($listofstatus as $status)
 	{
 		$dataseries[] = array($commandestatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+		if ($status == CommandeFournisseur::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+		if ($status == CommandeFournisseur::STATUS_VALIDATED) $colorseries[$status] = '-'.$badgeStatus1;
+		if ($status == CommandeFournisseur::STATUS_ACCEPTED) $colorseries[$status] = $badgeStatus1;
+		if ($status == CommandeFournisseur::STATUS_REFUSED) $colorseries[$status] = $badgeStatus9;
+		if ($status == CommandeFournisseur::STATUS_ORDERSENT) $colorseries[$status] = $badgeStatus4;
+		if ($status == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) $colorseries[$status] = '-'.$badgeStatus4;
+		if ($status == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $colorseries[$status] = $badgeStatus6;
+		if ($status == CommandeFournisseur::STATUS_CANCELED || $status == CommandeFournisseur::STATUS_CANCELED_AFTER_ORDER) $colorseries[$status] = $badgeStatus9;
+
 		if (!$conf->use_javascript_ajax)
 		{
 			print '<tr class="oddeven">';
@@ -137,6 +145,7 @@ if ($resql)
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 		$dolgraph = new DolGraph();
 		$dolgraph->SetData($dataseries);
+		$dolgraph->SetDataColor(array_values($colorseries));
 		$dolgraph->setShowLegend(2);
 		$dolgraph->setShowPercent(1);
 		$dolgraph->SetType(array('pie'));
@@ -157,53 +166,6 @@ else
 	dol_print_error($db);
 }
 
-/*
- * Legends / Status
- */
-
-$sql = "SELECT count(cf.rowid) as nb, cf.fk_statut";
-$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-$sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";
-if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-$sql .= " WHERE cf.fk_soc = s.rowid";
-$sql .= " AND cf.entity IN (".getEntity("supplier_order").")"; // Thirdparty sharing is mandatory with supplier order sharing
-if ($user->socid) $sql .= ' AND cf.fk_soc = '.$user->socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-$sql .= " GROUP BY cf.fk_statut";
-
-$resql = $db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="liste centpercent">';
-
-	print '<tr class="liste_titre"><th>'.$langs->trans("Status").'</th>';
-	print '<th class="right">'.$langs->trans("Nb").'</th>';
-	print "</tr>\n";
-
-	while ($i < $num)
-	{
-		$obj = $db->fetch_object($resql);
-
-		print '<tr class="oddeven">';
-		print '<td>'.$commandestatic->LibStatut($obj->nb).'</td>';
-		print '<td class="right"><a href="list.php?statut='.$obj->fk_statut.'">'.$obj->nb.' '.$commandestatic->LibStatut($obj->fk_statut, 3).'</a></td>';
-
-		print "</tr>\n";
-		$i++;
-	}
-	print "</table></div><br>";
-	$db->free($resql);
-}
-else
-{
-	dol_print_error($db);
-}
-
-
 /*
  * Draft orders
  */
@@ -267,7 +229,7 @@ if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_T
 }
 else
 {
-	$sql .= " WHERE (u.entity IN (".getEntity('user').")";
+	$sql .= " WHERE (u.entity IN (".getEntity('user')."))";
 }
 $sql .= " AND u.fk_soc IS NULL"; // An external user can not approved
 
@@ -322,7 +284,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 */
 $max = 5;
 
-$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom as name, s.rowid as socid";
+$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.tms, c.billed, s.nom as name, s.rowid as socid";
 $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
 $sql .= ", ".MAIN_DB_PREFIX."societe as s";
 if (!$user->rights->societe->client->voir && !$socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -376,7 +338,7 @@ if ($resql)
 
 			print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.$obj->name.'</a></td>';
 			print '<td>'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
-			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
+			print '<td class="right">'.$commandestatic->LibStatut($obj->status, 3, $obj->billed).'</td>';
 			print '</tr>';
 			$i++;
 		}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 329ee266362..0f724ef534e 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -905,6 +905,12 @@ if (empty($reshook))
 					$objectsrc->fetch($originid);
 					$objectsrc->fetch_thirdparty();
 
+					if (!empty($object->origin) && !empty($object->origin_id))
+					{
+						$object->linkedObjectsIds[$object->origin] = $object->origin_id;
+					}
+
+					// Add also link with order if object is reception
 					if ($object->origin == 'reception')
 					{
 						$objectsrc->fetchObjectLinked();
@@ -913,14 +919,10 @@ if (empty($reshook))
 						{
 							foreach ($objectsrc->linkedObjectsIds['order_supplier'] as $key => $value)
 							{
-								$object->linked_objects['order_supplier'] = $value;
+								$object->linkedObjectsIds['order_supplier'] = $value;
 							}
 						}
 					}
-					elseif (!empty($object->origin) && !empty($object->origin_id))
- 					{
-						$object->linkedObjectsIds[$object->origin] = $object->origin_id;
-					}
 
 					$id = $object->create($user);
 
@@ -950,7 +952,7 @@ if (empty($reshook))
 
 								// Extrafields
 								if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && method_exists($lines[$i], 'fetch_optionals')) {
-									$lines[$i]->fetch_optionals($lines[$i]->rowid);
+									$lines[$i]->fetch_optionals();
 								}
 
 								// Dates
@@ -1750,7 +1752,7 @@ if ($action == 'create')
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
 
 		// Replicate extrafields
-		$objectsrc->fetch_optionals($originid);
+		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
 	}
 	else
@@ -2077,7 +2079,7 @@ if ($action == 'create')
 
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td>';
-		$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1);
+		$formproject->select_projects((empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) ? $societe->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print '</td></tr>';
 	}
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index f45160b427e..a907bcd6bb0 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -918,7 +918,7 @@ if (empty($action) || $action == 'list')
         $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 '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
         // Lines for filters fields
         print '<tr class="liste_titre_filter">';
@@ -1019,9 +1019,9 @@ if (empty($action) || $action == 'list')
 
             // Amount
             print '<td class="right">'.price($objp->pamount).'</td>';
-            $totalarray['pos'][$totalarray['nbfield']] = 'amount';
-            $totalarray['val']['amount'] += $objp->pamount;
             if (!$i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['pos'][$totalarray['nbfield']] = 'amount';
+            $totalarray['val']['amount'] += $objp->pamount;
 
             // Ref invoice
             /*$invoicesupplierstatic->ref=$objp->ref_supplier;
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 5dc537908c2..b039dd64427 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -47,18 +47,18 @@ $sql.=" WHERE name like 'FTP_SERVER_%'";
 $result=$db->query($sql);
 if ($result)
 {
-    $obj = $db->fetch_object($result);
-    preg_match('/([0-9]+)$/i', $obj->name, $reg);
+	$obj = $db->fetch_object($result);
+	preg_match('/([0-9]+)$/i', $obj->name, $reg);
 	if ($reg[1]) $lastftpentry = $reg[1];
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 
 if ($action == 'add' || GETPOST('modify', 'alpha'))
 {
-    $ftp_name = "FTP_NAME_" . $entry;// $_POST["numero_entry"];
+	$ftp_name = "FTP_NAME_" . $entry;// $_POST["numero_entry"];
 	$ftp_server = "FTP_SERVER_" . $entry; //$_POST["numero_entry"];
 
 	$error=0;
@@ -75,14 +75,14 @@ if ($action == 'add' || GETPOST('modify', 'alpha'))
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Server")), null, 'errors');
 	}
 
-    if (! $error)
-    {
-    	$ftp_port = "FTP_PORT_" . $entry;
-        $ftp_user = "FTP_USER_" . $entry;
-        $ftp_password = "FTP_PASSWORD_" . $entry;
-        $ftp_passive = "FTP_PASSIVE_" . $entry;
+	if (! $error)
+	{
+		$ftp_port = "FTP_PORT_" . $entry;
+		$ftp_user = "FTP_USER_" . $entry;
+		$ftp_password = "FTP_PASSWORD_" . $entry;
+		$ftp_passive = "FTP_PASSIVE_" . $entry;
 
-        $db->begin();
+		$db->begin();
 
 		$result1=dolibarr_set_const($db, "FTP_PORT_" . $entry, GETPOST($ftp_port, 'alpha'), 'chaine', 0, '', $conf->entity);
 		if ($result1) $result2=dolibarr_set_const($db, "FTP_SERVER_" . $entry, GETPOST($ftp_server, 'alpha'), 'chaine', 0, '', $conf->entity);
@@ -91,25 +91,25 @@ if ($action == 'add' || GETPOST('modify', 'alpha'))
 		if ($result4) $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry, GETPOST($ftp_name, 'alpha'), 'chaine', 0, '', $conf->entity);
 		if ($result5) $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry, GETPOST($ftp_passive, 'alpha'), 'chaine', 0, '', $conf->entity);
 
-        if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
-        {
-            $db->commit();
-            header("Location: ".$_SERVER["PHP_SELF"]);
-            exit;
-        }
-        else
-        {
-            $db->rollback();
-            dol_print_error($db);
-        }
-    }
+		if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
+		{
+			$db->commit();
+			header("Location: ".$_SERVER["PHP_SELF"]);
+			exit;
+		}
+		else
+		{
+			$db->rollback();
+			dol_print_error($db);
+		}
+	}
 }
 
 if (GETPOST('delete', 'alpha'))
 {
-    if($entry)
-    {
-        $db->begin();
+	if($entry)
+	{
+		$db->begin();
 
 		$result1=dolibarr_del_const($db, "FTP_PORT_" . $entry, $conf->entity);
 		if ($result1) $result2=dolibarr_del_const($db, "FTP_SERVER_" . $entry, $conf->entity);
@@ -228,7 +228,7 @@ else
 		{
 			$obj = $db->fetch_object($resql);
 
-		    preg_match('/([0-9]+)$/i', $obj->name, $reg);
+			preg_match('/([0-9]+)$/i', $obj->name, $reg);
 			$idrss = $reg[0];
 			//print "x".join(',',$reg)."=".$obj->name."=".$idrss;
 
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index 1c5a85ecd50..f8fbb1459b0 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -46,11 +46,11 @@ if ($id)
 
 	dol_fiche_head($head, 'info', $langs->trans("Establishment"), -1, 'building');
 
-    print '<table width="100%"><tr><td>';
-    dol_print_object_info($object);
-    print '</td></tr></table>';
+	print '<table width="100%"><tr><td>';
+	dol_print_object_info($object);
+	print '</td></tr></table>';
 
-    print '</div>';
+	print '</div>';
 }
 
 // End of page
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index 909e30722cc..40a7d2eb1d9 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -34,8 +34,8 @@ $err = 0;
 // If the config file exists and is filled, we're not on first install so we skip the language selection page
 if (file_exists($conffile) && isset($dolibarr_main_url_root))
 {
-    header("Location: check.php?testget=ok");
-    exit;
+	header("Location: check.php?testget=ok");
+	exit;
 }
 
 $langs->load("admin");
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 b367091c3a0..fade1208c9c 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
@@ -45,6 +45,7 @@ UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version
 
 
 -- For v12
+DELETE FROM llx_menu where module='supplier_proposal';
 
 UPDATE llx_website SET lang = 'en' WHERE lang like 'en_%';
 UPDATE llx_website SET lang = 'fr' WHERE lang like 'fr_%';
@@ -121,7 +122,7 @@ create table llx_object_lang
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
   fk_object      integer      DEFAULT 0 NOT NULL,
-  type_object    varchar(32)  NOT NULL,
+  type_object    varchar(32)  NOT NULL,				-- value found into $object->element
   property       varchar(32)  NOT NULL,
   lang           varchar(5)   DEFAULT 0 NOT NULL,
   value          text,
@@ -198,3 +199,7 @@ ALTER TABLE llx_entrepot ADD COLUMN phone varchar(20) DEFAULT NULL;
 
 ALTER TABLE llx_accounting_account ADD COLUMN reconcilable tinyint DEFAULT 0 NOT NULL after active;
 
+ALTER TABLE llx_categorie MODIFY type integer NOT NULL DEFAULT 1;
+
+ALTER TABLE llx_societe_remise_except ADD COLUMN vat_src_code varchar(10) DEFAULT '';
+
diff --git a/htdocs/install/mysql/tables/llx_categorie.sql b/htdocs/install/mysql/tables/llx_categorie.sql
index ed1cb828363..c57c2adaa10 100644
--- a/htdocs/install/mysql/tables/llx_categorie.sql
+++ b/htdocs/install/mysql/tables/llx_categorie.sql
@@ -26,7 +26,7 @@ create table llx_categorie
 	fk_parent		integer DEFAULT 0 NOT NULL,
 	label 		    varchar(180) NOT NULL,				-- category ref/name
 	ref_ext			varchar(255),						-- reference into an external system (not used by dolibarr)
-	type	        tinyint DEFAULT 1 NOT NULL,			-- category type (product, supplier, customer, member)
+	type	        integer DEFAULT 1 NOT NULL,			-- category type (product, supplier, customer, member)
 	description 	text,								-- description of the category
     color           varchar(8),                         -- color
 	fk_soc          integer DEFAULT NULL,				-- not used by default. Used when option CATEGORY_ASSIGNED_TO_A_CUSTOMER is set.
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
index 750b40cb73c..22a0e241dd6 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
@@ -31,7 +31,7 @@ create table llx_commande_fournisseur_dispatch
   fk_entrepot    integer,
   fk_user        integer,
   comment		 varchar(255),		  -- comment on movement
-  batch          varchar(30) DEFAULT NULL,
+  batch          varchar(128) DEFAULT NULL,
   eatby          date DEFAULT NULL,
   sellby         date DEFAULT NULL,
   status         integer,
diff --git a/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql b/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
index af3a261e893..7a6a3bfd777 100644
--- a/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
+++ b/htdocs/install/mysql/tables/llx_expeditiondet_batch.sql
@@ -20,7 +20,7 @@ CREATE TABLE llx_expeditiondet_batch (
   fk_expeditiondet int NOT NULL,
   eatby date DEFAULT NULL,
   sellby date DEFAULT NULL,
-  batch varchar(30) DEFAULT NULL,
+  batch varchar(128) DEFAULT NULL,
   qty double NOT NULL DEFAULT '0',
   fk_origin_stock integer NOT NULL
 ) ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet.sql
index c70a2909882..b4df529433e 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet.sql
@@ -25,7 +25,7 @@ tms timestamp,
 fk_inventory integer DEFAULT 0, 
 fk_warehouse integer DEFAULT 0,
 fk_product integer DEFAULT 0,  
-batch varchar(30) DEFAULT NULL,	 -- Lot or serial number
+batch varchar(128) DEFAULT NULL,	 -- Lot or serial number
 qty_stock double DEFAULT NULL,   -- The targeted value. can be filled during draft edition
 qty_view double DEFAULT NULL, 	   -- must be filled once regulation is done
 qty_regulated double DEFAULT NULL  -- must be filled once regulation is done
diff --git a/htdocs/install/mysql/tables/llx_mrp_production.sql b/htdocs/install/mysql/tables/llx_mrp_production.sql
index 78b8847d9de..509d78a5c0e 100644
--- a/htdocs/install/mysql/tables/llx_mrp_production.sql
+++ b/htdocs/install/mysql/tables/llx_mrp_production.sql
@@ -23,7 +23,7 @@ CREATE TABLE llx_mrp_production(
 	qty real NOT NULL DEFAULT 1,
 	qty_frozen smallint DEFAULT 0,
     disable_stock_change smallint DEFAULT 0,
-	batch varchar(30),
+	batch varchar(128),
 	role varchar(10),      			-- 'toconsume' or 'toproduce' (initialized at MO creation), 'consumed' or 'produced' (added after MO validation)
 	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
diff --git a/htdocs/install/mysql/tables/llx_object_lang.sql b/htdocs/install/mysql/tables/llx_object_lang.sql
index 9bbc296d27c..cc4352f3acc 100644
--- a/htdocs/install/mysql/tables/llx_object_lang.sql
+++ b/htdocs/install/mysql/tables/llx_object_lang.sql
@@ -23,8 +23,8 @@ create table llx_object_lang
 (
   rowid          integer AUTO_INCREMENT PRIMARY KEY,
   fk_object      integer      DEFAULT 0 NOT NULL,
-  type_object    varchar(32)  NOT NULL,					-- 'thirdparty', 'contact', '...'
-  property       varchar(32)  NOT NULL,
+  type_object    varchar(32)  NOT NULL,					-- value found into $object->element: 'thirdparty', 'contact', '...'
+  property       varchar(32)  NOT NULL,					-- name of property
   lang           varchar(5)   DEFAULT 0 NOT NULL,
   value          text,
   import_key varchar(14) DEFAULT NULL
diff --git a/htdocs/install/mysql/tables/llx_product_batch.sql b/htdocs/install/mysql/tables/llx_product_batch.sql
index ba8b7ff59e4..7b09d6a0024 100644
--- a/htdocs/install/mysql/tables/llx_product_batch.sql
+++ b/htdocs/install/mysql/tables/llx_product_batch.sql
@@ -24,7 +24,7 @@ CREATE TABLE llx_product_batch (
   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
-  batch varchar(30) NOT NULL,
+  batch varchar(128) NOT NULL,
   qty double NOT NULL DEFAULT 0,
   import_key varchar(14) DEFAULT NULL
 ) ENGINE=InnoDB;
diff --git a/htdocs/install/mysql/tables/llx_product_lot.sql b/htdocs/install/mysql/tables/llx_product_lot.sql
index 493a8792f20..885f699d800 100644
--- a/htdocs/install/mysql/tables/llx_product_lot.sql
+++ b/htdocs/install/mysql/tables/llx_product_lot.sql
@@ -21,7 +21,7 @@ CREATE TABLE llx_product_lot (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   entity          integer DEFAULT 1,
   fk_product      integer NOT NULL,				-- Id of product
-  batch           varchar(30) DEFAULT NULL,		-- Lot or serial number
+  batch           varchar(128) DEFAULT NULL,	-- Lot or serial number
   eatby           date DEFAULT NULL,			-- Eatby date
   sellby          date DEFAULT NULL, 			-- Sellby date
   datec         datetime,
diff --git a/htdocs/install/mysql/tables/llx_societe_remise_except.sql b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
index 50cbfae51c1..63762f8ad32 100644
--- a/htdocs/install/mysql/tables/llx_societe_remise_except.sql
+++ b/htdocs/install/mysql/tables/llx_societe_remise_except.sql
@@ -30,6 +30,7 @@ create table llx_societe_remise_except
   amount_tva				double(24,8) DEFAULT 0 NOT NULL,
   amount_ttc				double(24,8) DEFAULT 0 NOT NULL,
   tva_tx					double(6,3)  DEFAULT 0 NOT NULL,
+  vat_src_code				varchar(10)  DEFAULT '',				-- Vat code used as source of vat fields. Not strict foreign key here.
   fk_user					integer NOT NULL,
   fk_facture_line			integer,
   fk_facture				integer,
diff --git a/htdocs/install/mysql/tables/llx_stock_mouvement.sql b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
index 397165e296c..94501a516dd 100644
--- a/htdocs/install/mysql/tables/llx_stock_mouvement.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement.sql
@@ -21,9 +21,9 @@ create table llx_stock_mouvement
 (
   rowid           integer AUTO_INCREMENT PRIMARY KEY,
   tms             timestamp,
-  datem           datetime,							-- Date and hour of movement
+  datem           datetime,						-- Date and hour of movement
   fk_product      integer NOT NULL,				-- Id of product
-  batch           varchar(30) DEFAULT NULL,		-- Lot or serial number
+  batch           varchar(128) DEFAULT NULL,	-- Lot or serial number
   eatby           date DEFAULT NULL,			-- Eatby date (deprecated, we should get value from batch number in table llx_product_lot)
   sellby          date DEFAULT NULL,			-- Sellby date (deprecated, we should get value from batch number in table llx_product_lot) 
   fk_entrepot     integer NOT NULL,				-- Id warehouse
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index b1069618414..fcb19b91421 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -44,12 +44,12 @@ $action=GETPOST('action', 'alpha')?GETPOST('action', 'alpha'):(empty($argv[4])?'
 $targetversion=DOL_VERSION;		// If it's latest upgrade
 if (! empty($action) && preg_match('/upgrade/i', $action))	// If it's an old upgrade
 {
-    $tmp=explode('_', $action, 2);
-    if ($tmp[0]=='upgrade')
-    {
-        if (! empty($tmp[1])) $targetversion=$tmp[1];   // if $action = 'upgrade_6.0.0-beta', we use '6.0.0-beta'
-        else $targetversion=DOL_VERSION;                // if $action = 'upgrade', we use DOL_VERSION
-    }
+	$tmp=explode('_', $action, 2);
+	if ($tmp[0]=='upgrade')
+	{
+		if (! empty($tmp[1])) $targetversion=$tmp[1];   // if $action = 'upgrade_6.0.0-beta', we use '6.0.0-beta'
+		else $targetversion=DOL_VERSION;                // if $action = 'upgrade', we use DOL_VERSION
+	}
 }
 
 $langs->loadLangs(array("admin", "install"));
@@ -112,241 +112,241 @@ print '<br>';
 // Test if we can run a first install process
 if (empty($versionfrom) && empty($versionto) && ! is_writable($conffile))
 {
-    print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
-    pFooter(1, $setuplang, 'jscheckparam');
-    exit;
+	print $langs->trans("ConfFileIsNotWritable", $conffiletoshow);
+	pFooter(1, $setuplang, 'jscheckparam');
+	exit;
 }
 
 if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 {
-    $error=0;
+	$error=0;
 
-    // If password is encoded, we decode it
-    if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass))
-    {
-        require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
-        if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
-        {
-            $dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
-            $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
-            $dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass;	// We need to set this as it is used to know the password was initially crypted
-        }
-        else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
-    }
+	// If password is encoded, we decode it
+	if (preg_match('/crypted:/i', $dolibarr_main_db_pass) || ! empty($dolibarr_main_db_encrypted_pass))
+	{
+		require_once $dolibarr_main_document_root.'/core/lib/security.lib.php';
+		if (preg_match('/crypted:/i', $dolibarr_main_db_pass))
+		{
+			$dolibarr_main_db_pass = preg_replace('/crypted:/i', '', $dolibarr_main_db_pass);
+			$dolibarr_main_db_pass = dol_decode($dolibarr_main_db_pass);
+			$dolibarr_main_db_encrypted_pass = $dolibarr_main_db_pass;	// We need to set this as it is used to know the password was initially crypted
+		}
+		else $dolibarr_main_db_pass = dol_decode($dolibarr_main_db_encrypted_pass);
+	}
 
-    $conf->db->type = $dolibarr_main_db_type;
-    $conf->db->host = $dolibarr_main_db_host;
-    $conf->db->port = $dolibarr_main_db_port;
-    $conf->db->name = $dolibarr_main_db_name;
-    $conf->db->user = $dolibarr_main_db_user;
-    $conf->db->pass = $dolibarr_main_db_pass;
-    $conf->db->dolibarr_main_db_encryption = isset($dolibarr_main_db_encryption)?$dolibarr_main_db_encryption:'';
-    $conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey)?$dolibarr_main_db_cryptkey:'';
+	$conf->db->type = $dolibarr_main_db_type;
+	$conf->db->host = $dolibarr_main_db_host;
+	$conf->db->port = $dolibarr_main_db_port;
+	$conf->db->name = $dolibarr_main_db_name;
+	$conf->db->user = $dolibarr_main_db_user;
+	$conf->db->pass = $dolibarr_main_db_pass;
+	$conf->db->dolibarr_main_db_encryption = isset($dolibarr_main_db_encryption)?$dolibarr_main_db_encryption:'';
+	$conf->db->dolibarr_main_db_cryptkey = isset($dolibarr_main_db_cryptkey)?$dolibarr_main_db_cryptkey:'';
 
-    $db=getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
+	$db=getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf->db->pass, $conf->db->name, $conf->db->port);
 
-    // Create the global $hookmanager object
-    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-    $hookmanager=new HookManager($db);
+	// Create the global $hookmanager object
+	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+	$hookmanager=new HookManager($db);
 
-    $ok = 0;
+	$ok = 0;
 
-    // If first install
-    if ($action == "set")
-    {
-        // Active module user
-        $modName='modUser';
-        $file = $modName . ".class.php";
-        dolibarr_install_syslog('step5: load module user ' . DOL_DOCUMENT_ROOT . "/core/modules/" . $file, LOG_INFO);
-        include_once DOL_DOCUMENT_ROOT ."/core/modules/".$file;
-        $objMod = new $modName($db);
-        $result=$objMod->init();
-        if (! $result) print 'ERROR in activating module file='.$file;
+	// If first install
+	if ($action == "set")
+	{
+		// Active module user
+		$modName='modUser';
+		$file = $modName . ".class.php";
+		dolibarr_install_syslog('step5: load module user ' . DOL_DOCUMENT_ROOT . "/core/modules/" . $file, LOG_INFO);
+		include_once DOL_DOCUMENT_ROOT ."/core/modules/".$file;
+		$objMod = new $modName($db);
+		$result=$objMod->init();
+		if (! $result) print 'ERROR in activating module file='.$file;
 
-        if ($db->connected)
-        {
-            $conf->setValues($db);
-            // Reset forced setup after the setValues
-            if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE');
-            $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
+		if ($db->connected)
+		{
+			$conf->setValues($db);
+			// Reset forced setup after the setValues
+			if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE');
+			$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
-            // Create admin user
-            include_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
+			// Create admin user
+			include_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
 
-            // Set default encryption to yes, generate a salt and set default encryption algorythm (but only if there is no user yet into database)
-		    $sql = "SELECT u.rowid, u.pass, u.pass_crypted";
-		    $sql.= " FROM ".MAIN_DB_PREFIX."user as u";
-		    $resql=$db->query($sql);
-		    if ($resql)
-		    {
-		        $numrows=$db->num_rows($resql);
-    			if ($numrows == 0)
-    			{
-    			    // Define default setup for password encryption
-    			    dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
-    			    dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0);      // All entities
-                    if (function_exists('password_hash'))
-                        dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0);                     // All entities
-                    else
-                        dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);                           // All entities
-    			}
+			// Set default encryption to yes, generate a salt and set default encryption algorythm (but only if there is no user yet into database)
+			$sql = "SELECT u.rowid, u.pass, u.pass_crypted";
+			$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
+			$resql=$db->query($sql);
+			if ($resql)
+			{
+				$numrows=$db->num_rows($resql);
+				if ($numrows == 0)
+				{
+					// Define default setup for password encryption
+					dolibarr_set_const($db, "DATABASE_PWD_ENCRYPTED", "1", 'chaine', 0, '', $conf->entity);
+					dolibarr_set_const($db, "MAIN_SECURITY_SALT", dol_print_date(dol_now(), 'dayhourlog'), 'chaine', 0, '', 0);      // All entities
+					if (function_exists('password_hash'))
+						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'password_hash', 'chaine', 0, '', 0);                     // All entities
+					else
+						dolibarr_set_const($db, "MAIN_SECURITY_HASH_ALGO", 'sha1md5', 'chaine', 0, '', 0);                           // All entities
+				}
 
-    			dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.$conf->global->DATABASE_PWD_ENCRYPTED.' MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO, LOG_INFO);
-		    }
+				dolibarr_install_syslog('step5: DATABASE_PWD_ENCRYPTED = '.$conf->global->DATABASE_PWD_ENCRYPTED.' MAIN_SECURITY_HASH_ALGO = '.$conf->global->MAIN_SECURITY_HASH_ALGO, LOG_INFO);
+			}
 
-		    // Create user used to create the admin user
-            $createuser=new User($db);
-            $createuser->id=0;
-            $createuser->admin=1;
+			// Create user used to create the admin user
+			$createuser=new User($db);
+			$createuser->id=0;
+			$createuser->admin=1;
 
-            // Set admin user
-            $newuser = new User($db);
-            $newuser->lastname='SuperAdmin';
-            $newuser->firstname='';
-            $newuser->login = $login;
-            $newuser->pass = $pass;
-            $newuser->admin=1;
-            $newuser->entity=0;
+			// Set admin user
+			$newuser = new User($db);
+			$newuser->lastname='SuperAdmin';
+			$newuser->firstname='';
+			$newuser->login = $login;
+			$newuser->pass = $pass;
+			$newuser->admin=1;
+			$newuser->entity=0;
 
-            $conf->global->USER_MAIL_REQUIRED=0;     // Force global option to be sure to create a new user with no email
-            $result=$newuser->create($createuser, 1);
-            if ($result > 0)
-            {
-                print $langs->trans("AdminLoginCreatedSuccessfuly", $login) . "<br>";
-                $success = 1;
-            }
-            else
-            {
-                if ($newuser->error == 'ErrorLoginAlreadyExists')
-                {
-                    dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
-                    print '<br><div class="warning">' . $langs->trans("AdminLoginAlreadyExists", $login) . "</div><br>";
-                    $success = 1;
-                }
-                else
-                {
-                    dolibarr_install_syslog('step5: FailedToCreateAdminLogin ' . $newuser->error, LOG_ERR);
-                    print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
-                }
-            }
+			$conf->global->USER_MAIL_REQUIRED=0;     // Force global option to be sure to create a new user with no email
+			$result=$newuser->create($createuser, 1);
+			if ($result > 0)
+			{
+				print $langs->trans("AdminLoginCreatedSuccessfuly", $login) . "<br>";
+				$success = 1;
+			}
+			else
+			{
+				if ($newuser->error == 'ErrorLoginAlreadyExists')
+				{
+					dolibarr_install_syslog('step5: AdminLoginAlreadyExists', LOG_WARNING);
+					print '<br><div class="warning">' . $langs->trans("AdminLoginAlreadyExists", $login) . "</div><br>";
+					$success = 1;
+				}
+				else
+				{
+					dolibarr_install_syslog('step5: FailedToCreateAdminLogin ' . $newuser->error, LOG_ERR);
+					print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
+				}
+			}
 
-            if ($success)
-            {
-                // Insert MAIN_VERSION_FIRST_INSTALL in a dedicated transaction. So if it fails (when first install was already done), we can do other following requests.
-                $db->begin();
-                dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to ' . $targetversion, LOG_DEBUG);
-                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when first install',0)");
-                if ($resql)
-                {
-                    $conf->global->MAIN_VERSION_FIRST_INSTALL=$targetversion;
-                    $db->commit();
-                }
-                else
-                {
-                    //if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
-                    $db->commit();
-                }
+			if ($success)
+			{
+				// Insert MAIN_VERSION_FIRST_INSTALL in a dedicated transaction. So if it fails (when first install was already done), we can do other following requests.
+				$db->begin();
+				dolibarr_install_syslog('step5: set MAIN_VERSION_FIRST_INSTALL const to ' . $targetversion, LOG_DEBUG);
+				$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_FIRST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when first install',0)");
+				if ($resql)
+				{
+					$conf->global->MAIN_VERSION_FIRST_INSTALL=$targetversion;
+					$db->commit();
+				}
+				else
+				{
+					//if (! $resql) dol_print_error($db,'Error in setup program');      // We ignore errors. Key may already exists
+					$db->commit();
+				}
 
-                $db->begin();
+				$db->begin();
 
-                dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
-                $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
-                if (! $resql) dol_print_error($db, 'Error in setup program');
-                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when last install',0)");
-                if (! $resql) dol_print_error($db, 'Error in setup program');
-                $conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion;
+				dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_INSTALL const to ' . $targetversion, LOG_DEBUG);
+				$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
+				if (! $resql) dol_print_error($db, 'Error in setup program');
+				$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version when last install',0)");
+				if (! $resql) dol_print_error($db, 'Error in setup program');
+				$conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion;
 
-                if ($useforcedwizard)
-                {
-                    dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
-                    $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
-                    if (! $resql) dol_print_error($db, 'Error in setup program');
-                    $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING', 1).",".$db->encrypt(1, 1).",'chaine',1,'Disable install warnings',0)");
-                    if (! $resql) dol_print_error($db, 'Error in setup program');
-                    $conf->global->MAIN_REMOVE_INSTALL_WARNING=1;
-                }
+				if ($useforcedwizard)
+				{
+					dolibarr_install_syslog('step5: set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
+					$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
+					if (! $resql) dol_print_error($db, 'Error in setup program');
+					$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING', 1).",".$db->encrypt(1, 1).",'chaine',1,'Disable install warnings',0)");
+					if (! $resql) dol_print_error($db, 'Error in setup program');
+					$conf->global->MAIN_REMOVE_INSTALL_WARNING=1;
+				}
 
-                // If we ask to force some modules to be enabled
-                if (! empty($force_install_module))
-                {
-                    if (! defined('DOL_DOCUMENT_ROOT') && ! empty($dolibarr_main_document_root)) define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);
+				// If we ask to force some modules to be enabled
+				if (! empty($force_install_module))
+				{
+					if (! defined('DOL_DOCUMENT_ROOT') && ! empty($dolibarr_main_document_root)) define('DOL_DOCUMENT_ROOT', $dolibarr_main_document_root);
 
-                    $tmparray=explode(',', $force_install_module);
-                    foreach ($tmparray as $modtoactivate)
-                    {
-                        $modtoactivatenew=preg_replace('/\.class\.php$/i', '', $modtoactivate);
-                        print $langs->trans("ActivateModule", $modtoactivatenew).'<br>';
+					$tmparray=explode(',', $force_install_module);
+					foreach ($tmparray as $modtoactivate)
+					{
+						$modtoactivatenew=preg_replace('/\.class\.php$/i', '', $modtoactivate);
+						print $langs->trans("ActivateModule", $modtoactivatenew).'<br>';
 
-                        $file=$modtoactivatenew.'.class.php';
-                        dolibarr_install_syslog('step5: activate module file=' . $file);
-                        $res=dol_include_once("/core/modules/".$file);
+						$file=$modtoactivatenew.'.class.php';
+						dolibarr_install_syslog('step5: activate module file=' . $file);
+						$res=dol_include_once("/core/modules/".$file);
 
-                        $res=activateModule($modtoactivatenew, 1);
-                        if (! empty($res['errors'])) print 'ERROR in activating module file='.$file;
-                    }
-                }
+						$res=activateModule($modtoactivatenew, 1);
+						if (! empty($res['errors'])) print 'ERROR in activating module file='.$file;
+					}
+				}
 
-                dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const');
-                $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");
-                if (! $resql) dol_print_error($db, 'Error in setup program');
+				dolibarr_install_syslog('step5: remove MAIN_NOT_INSTALLED const');
+				$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");
+				if (! $resql) dol_print_error($db, 'Error in setup program');
 
-                $db->commit();
-            }
-        }
-        else
-        {
-            print $langs->trans("ErrorFailedToConnect")."<br>";
-        }
-    }
-    // If upgrade
-    elseif (empty($action) || preg_match('/upgrade/i', $action))
-    {
-        if ($db->connected)
-        {
-            $conf->setValues($db);
-            // Reset forced setup after the setValues
-            if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE');
-            $conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
+				$db->commit();
+			}
+		}
+		else
+		{
+			print $langs->trans("ErrorFailedToConnect")."<br>";
+		}
+	}
+	// If upgrade
+	elseif (empty($action) || preg_match('/upgrade/i', $action))
+	{
+		if ($db->connected)
+		{
+			$conf->setValues($db);
+			// Reset forced setup after the setValues
+			if (defined('SYSLOG_FILE')) $conf->global->SYSLOG_FILE=constant('SYSLOG_FILE');
+			$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
-            // Define if we need to update the MAIN_VERSION_LAST_UPGRADE value in database
-            $tagdatabase=false;
-            if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) $tagdatabase=true;	// We don't know what it was before, so now we consider we are version choosed.
-            else
-            {
-                $mainversionlastupgradearray=preg_split('/[.-]/', $conf->global->MAIN_VERSION_LAST_UPGRADE);
-                $targetversionarray=preg_split('/[.-]/', $targetversion);
-                if (versioncompare($targetversionarray, $mainversionlastupgradearray) > 0) $tagdatabase=true;
-            }
+			// Define if we need to update the MAIN_VERSION_LAST_UPGRADE value in database
+			$tagdatabase=false;
+			if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE)) $tagdatabase=true;	// We don't know what it was before, so now we consider we are version choosed.
+			else
+			{
+				$mainversionlastupgradearray=preg_split('/[.-]/', $conf->global->MAIN_VERSION_LAST_UPGRADE);
+				$targetversionarray=preg_split('/[.-]/', $targetversion);
+				if (versioncompare($targetversionarray, $mainversionlastupgradearray) > 0) $tagdatabase=true;
+			}
 
-            if ($tagdatabase)
-            {
-                dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value ' . $targetversion);
-                $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
-                if (! $resql) dol_print_error($db, 'Error in setup program');
-                $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version for last upgrade',0)");
-                if (! $resql) dol_print_error($db, 'Error in setup program');
-                $conf->global->MAIN_VERSION_LAST_UPGRADE=$targetversion;
-            }
-            else
-            {
-                dolibarr_install_syslog('step5: we run an upgrade to version ' . $targetversion . ' but database was already upgraded to ' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
-            }
-        }
-        else
-        {
-            print $langs->trans("ErrorFailedToConnect")."<br>";
-        }
-    }
-    else
-    {
-        dol_print_error('', 'step5.php: unknown choice of action');
-    }
+			if ($tagdatabase)
+			{
+				dolibarr_install_syslog('step5: set MAIN_VERSION_LAST_UPGRADE const to value ' . $targetversion);
+				$resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
+				if (! $resql) dol_print_error($db, 'Error in setup program');
+				$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE', 1).",".$db->encrypt($targetversion, 1).",'chaine',0,'Dolibarr version for last upgrade',0)");
+				if (! $resql) dol_print_error($db, 'Error in setup program');
+				$conf->global->MAIN_VERSION_LAST_UPGRADE=$targetversion;
+			}
+			else
+			{
+				dolibarr_install_syslog('step5: we run an upgrade to version ' . $targetversion . ' but database was already upgraded to ' . $conf->global->MAIN_VERSION_LAST_UPGRADE . '. We keep MAIN_VERSION_LAST_UPGRADE as it is.');
+			}
+		}
+		else
+		{
+			print $langs->trans("ErrorFailedToConnect")."<br>";
+		}
+	}
+	else
+	{
+		dol_print_error('', 'step5.php: unknown choice of action');
+	}
 
-    // May fail if parameter already defined
-    $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT', 1).",".$db->encrypt($setuplang, 1).",'chaine',0,'Default language',1)");
-    //if (! $resql) dol_print_error($db,'Error in setup program');
+	// May fail if parameter already defined
+	$resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT', 1).",".$db->encrypt($setuplang, 1).",'chaine',0,'Default language',1)");
+	//if (! $resql) dol_print_error($db,'Error in setup program');
 
-    $db->close();
+	$db->close();
 }
 
 
@@ -356,104 +356,104 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action))
 // If first install
 if ($action == "set" && $success)
 {
-    if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION))
-    {
-        // Install is finished
-        print $langs->trans("SystemIsInstalled")."<br>";
+	if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION))
+	{
+		// Install is finished
+		print $langs->trans("SystemIsInstalled")."<br>";
 
-        $createlock=0;
+		$createlock=0;
 
-        if (! empty($force_install_lockinstall) || ! empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE))
-        {
-            // Install is finished, we create the lock file
-            $lockfile=DOL_DATA_ROOT.'/install.lock';
-            $fp = @fopen($lockfile, "w");
-            if ($fp)
-            {
-            	if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) $force_install_lockinstall=444;    // For backward compatibility
-                fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
-                fclose($fp);
-                @chmod($lockfile, octdec($force_install_lockinstall));
-                $createlock=1;
-            }
-        }
-        if (empty($createlock))
-        {
-            print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
-        }
+		if (! empty($force_install_lockinstall) || ! empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE))
+		{
+			// Install is finished, we create the lock file
+			$lockfile=DOL_DATA_ROOT.'/install.lock';
+			$fp = @fopen($lockfile, "w");
+			if ($fp)
+			{
+				if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) $force_install_lockinstall=444;    // For backward compatibility
+				fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
+				fclose($fp);
+				@chmod($lockfile, octdec($force_install_lockinstall));
+				$createlock=1;
+			}
+		}
+		if (empty($createlock))
+		{
+			print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
+		}
 
-        print "<br>";
+		print "<br>";
 
-        print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";
+		print $langs->trans("YouNeedToPersonalizeSetup")."<br><br>";
 
-        print '<div class="center"><a href="../admin/index.php?mainmenu=home&leftmenu=setup' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
-        print $langs->trans("GoToSetupArea");
-        print '</a></div>';
-    }
-    else
-    {
-        // If here MAIN_VERSION_LAST_UPGRADE is not empty
-        print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
-        print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
-        print $langs->trans("MigrationNotFinished").'<br>';
-        print "<br>";
+		print '<div class="center"><a href="../admin/index.php?mainmenu=home&leftmenu=setup' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
+		print $langs->trans("GoToSetupArea");
+		print '</a></div>';
+	}
+	else
+	{
+		// If here MAIN_VERSION_LAST_UPGRADE is not empty
+		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
+		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
+		print $langs->trans("MigrationNotFinished").'<br>';
+		print "<br>";
 
-        print '<div class="center"><a href="'.$dolibarr_main_url_root .'/install/index.php">';
-        print $langs->trans("GoToUpgradePage");
-        print '</a></div>';
-    }
+		print '<div class="center"><a href="'.$dolibarr_main_url_root .'/install/index.php">';
+		print $langs->trans("GoToUpgradePage");
+		print '</a></div>';
+	}
 }
 // If upgrade
 elseif (empty($action) || preg_match('/upgrade/i', $action))
 {
-    if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION))
-    {
-        // Upgrade is finished
-        print $langs->trans("SystemIsUpgraded")."<br>";
+	if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION))
+	{
+		// Upgrade is finished
+		print $langs->trans("SystemIsUpgraded")."<br>";
 
-        $createlock=0;
+		$createlock=0;
 
-        if (! empty($force_install_lockinstall) || ! empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE))
-        {
-            // Upgrade is finished, we create the lock file
-            $lockfile=DOL_DATA_ROOT.'/install.lock';
-            $fp = @fopen($lockfile, "w");
-            if ($fp)
-            {
-            	if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) $force_install_lockinstall=444;    // For backward compatibility
-                fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
-                fclose($fp);
-                @chmod($lockfile, octdec($force_install_lockinstall));
-                $createlock=1;
-            }
-        }
-        if (empty($createlock))
-        {
-            print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
-        }
+		if (! empty($force_install_lockinstall) || ! empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE))
+		{
+			// Upgrade is finished, we create the lock file
+			$lockfile=DOL_DATA_ROOT.'/install.lock';
+			$fp = @fopen($lockfile, "w");
+			if ($fp)
+			{
+				if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) $force_install_lockinstall=444;    // For backward compatibility
+				fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
+				fclose($fp);
+				@chmod($lockfile, octdec($force_install_lockinstall));
+				$createlock=1;
+			}
+		}
+		if (empty($createlock))
+		{
+			print '<br><div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
+		}
 
-        print "<br><br>";
+		print "<br><br>";
 
-        print '<div class="center"><a href="../index.php?mainmenu=home' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
-        print $langs->trans("GoToDolibarr").'...';
-        print '</a></div><br>';
-    }
-    else
-    {
-        // If here MAIN_VERSION_LAST_UPGRADE is not empty
-        print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
-        print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
+		print '<div class="center"><a href="../index.php?mainmenu=home' . (isset($login) ? '&username=' . urlencode($login) : '') . '">';
+		print $langs->trans("GoToDolibarr").'...';
+		print '</a></div><br>';
+	}
+	else
+	{
+		// If here MAIN_VERSION_LAST_UPGRADE is not empty
+		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
+		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b>';
 
-        print "<br>";
+		print "<br>";
 
-        print '<div class="center"><a href="../install/index.php">';
-        print $langs->trans("GoToUpgradePage");
-        print '</a></div>';
-    }
+		print '<div class="center"><a href="../install/index.php">';
+		print $langs->trans("GoToUpgradePage");
+		print '</a></div>';
+	}
 }
 else
 {
-    dol_print_error('', 'step5.php: unknown choice of action');
+	dol_print_error('', 'step5.php: unknown choice of action');
 }
 
 // Clear cache files
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 66d53398f96..d2f03580391 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -5115,7 +5115,7 @@ function migrate_members_socialnetworks()
                 $obj->socialnetworks = '[]';
             }
             $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'adherent SET socialnetworks="'.$db->escape(json_encode($socialnetworks, true)).'"';
+            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."adherent SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
             $sqlupd.= ', skype=null';
             $sqlupd.= ', twitter=null';
             $sqlupd.= ', facebook=null';
@@ -5209,7 +5209,7 @@ function migrate_contacts_socialnetworks()
                 $obj->socialnetworks = '[]';
             }
             $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'socpeople SET socialnetworks="'.$db->escape(json_encode($socialnetworks, true)).'"';
+            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."socpeople SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
             $sqlupd.= ', jabberid=null';
             $sqlupd.= ', skype=null';
             $sqlupd.= ', twitter=null';
@@ -5300,7 +5300,7 @@ function migrate_thirdparties_socialnetworks()
                 $obj->socialnetworks = '[]';
             }
             $socialnetworks = array_merge($arraysocialnetworks, json_decode($obj->socialnetworks, true));
-            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX.'societe SET socialnetworks="'.$db->escape(json_encode($socialnetworks, true)).'"';
+            $sqlupd = 'UPDATE '.MAIN_DB_PREFIX."societe SET socialnetworks='".$db->escape(json_encode($socialnetworks, true))."'";
             $sqlupd.= ', skype=null';
             $sqlupd.= ', twitter=null';
             $sqlupd.= ', facebook=null';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b1eb3778af8..51ff5f4e2f7 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -1109,7 +1109,7 @@ Delays_MAIN_DELAY_HOLIDAYS=Leave requests to approve
 SetupDescription1=Before starting to use Dolibarr some initial parameters must be defined and modules enabled/configured.
 SetupDescription2=The following two sections are mandatory (the two first entries in the Setup menu):
 SetupDescription3=<a href="%s">%s -> %s</a><br><br>Basic parameters used to customize the default behavior of your application (e.g for country-related features).
-SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications, all more or less independent. The modules relevant to your needs must be enabled and configured. New items/options are added to menus with the activation of a module.
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>This software is a suite of many modules/applications. The modules related to your needs must be enabled and configured. Menu entries will appears with the activation of these modules.
 SetupDescription5=Other Setup menu entries manage optional parameters.
 LogEvents=Security audit events
 Audit=Audit
@@ -1128,7 +1128,7 @@ LogEventDesc=Enable logging for specific security events. Administrators the log
 AreaForAdminOnly=Setup parameters can be set by <b>administrator users</b> only.
 SystemInfoDesc=System information is miscellaneous technical information you get in read only mode and visible for administrators only.
 SystemAreaForAdminOnly=This area is available to administrator users only. Dolibarr user permissions cannot change this restriction.
-CompanyFundationDesc=Edit the information of the company/entity. Click on "%s" button at the bottom of the page.
+CompanyFundationDesc=Edit the information of your company/organization. Click on "%s" button at the bottom of the page when done.
 AccountantDesc=If you have an external accountant/bookkeeper, you can edit here its information.
 AccountantFileNumber=Accountant code
 DisplayDesc=Parameters affecting the look and behaviour of Dolibarr can be modified here.
@@ -1982,5 +1982,5 @@ MakeAnonymousPing=Make an anonymous Ping '+1' to the Dolibarr foundation server
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Template for email
 EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some text title in your PDF duplicated in 2 different languages in the same generate PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
+PDF_USE_ALSO_LANGUAGE_CODE=If you want to have some texts in your PDF duplicated in 2 different languages in the same generated PDF, you must set here this second language so generated PDF will contains 2 different languages in same page, the one chosen when generating PDF and this one (only few PDF templates support this). Keep empty for 1 language per PDF.
 FafaIconSocialNetworksDesc=Enter here the code of a FontAwesome icon. If you don't know what is FontAwesome, you can use the generic value fa-address-book.
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 8fe1f84b149..bd62684421a 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -27,8 +27,8 @@ BoxTitleLastSuppliers=Latest %s recorded suppliers
 BoxTitleLastModifiedSuppliers=Vendors: last %s modified
 BoxTitleLastModifiedCustomers=Customers: last %s modified
 BoxTitleLastCustomersOrProspects=Latest %s customers or prospects
-BoxTitleLastCustomerBills=Latest %s Customer invoices
-BoxTitleLastSupplierBills=Latest %s Vendor invoices
+BoxTitleLastCustomerBills=Latest %s modified Customer invoices
+BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
 BoxTitleLastModifiedProspects=Prospects: last %s modified
 BoxTitleLastModifiedMembers=Latest %s members
 BoxTitleLastFicheInter=Latest %s modified interventions
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index a70e470e8a8..c492417e2a8 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -97,3 +97,4 @@ TakeposNumpadUsePaymentIcon=Use payment icon on numpad
 CashDeskRefNumberingModules=Numbering module for cash desk
 CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal number
 TakeposGroupSameProduct=Group same products lines
+StartAParallelSale=Start a new parallel sale
\ No newline at end of file
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 867f73af887..e5233479571 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -1021,4 +1021,5 @@ StatisticsOn=Statistics on
 SelectYourGraphOptionsFirst=Select your graph options to build a graph
 Measures=Measures
 XAxis=X-Axis
-YAxis=Y-Axis
\ No newline at end of file
+YAxis=Y-Axis
+StatusOfRefMustBe=Status of %s must be %s
diff --git a/htdocs/langs/en_US/multicurrency.lang b/htdocs/langs/en_US/multicurrency.lang
index 4dc04ff2622..bfcbd11fb7c 100644
--- a/htdocs/langs/en_US/multicurrency.lang
+++ b/htdocs/langs/en_US/multicurrency.lang
@@ -18,3 +18,5 @@ MulticurrencyReceived=Received, original currency
 MulticurrencyRemainderToTake=Remaining amount, original currency
 MulticurrencyPaymentAmount=Payment amount, original currency
 AmountToOthercurrency=Amount To (in currency of receiving account)
+CurrencyRateSyncSucceed=Currency rate synchronization done successfuly
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Use the currency of the document for online payments
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 505fd0a97db..ad91e1eef63 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -146,6 +146,7 @@ PDFEratostheneDescription=A complete order model
 PDFEdisonDescription=A simple order model
 PDFProformaDescription=A complete Proforma invoice template
 CreateInvoiceForThisCustomer=Bill orders
+CreateInvoiceForThisSupplier=Bill orders
 NoOrdersToInvoice=No orders billable
 CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
 OrderCreation=Order creation
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 94e440f9ab9..ead6dbf0ade 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -240,6 +240,7 @@ LatestModifiedProjects=Latest %s modified projects
 OtherFilteredTasks=Other filtered tasks
 NoAssignedTasks=No assigned tasks found (assign project/tasks to the current user from the top select box to enter time on it)
 ThirdPartyRequiredToGenerateInvoice=A third party must be defined on project to be able to invoice it.
+ChooseANotYetAssignedTask=Choose a task not yet assigned to you
 # Comments trans
 AllowCommentOnTask=Allow user comments on tasks
 AllowCommentOnProject=Allow user comments on projects
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index b879f3d740f..8102db49f28 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -515,9 +515,8 @@ else	// View
 			// Other attributes
 			if ($action == 'create_delivery') {
 				// copy from expedition
-				$expeditionExtrafields = new Extrafields($db);
-				$expeditionExtrafieldLabels = $expeditionExtrafields->fetch_name_optionals_label($expedition->table_element);
-				if ($expedition->fetch_optionals($object->origin_id) > 0) {
+				$extrafields->fetch_name_optionals_label($expedition->table_element);
+				if ($expedition->fetch_optionals() > 0) {
 					$object->array_options = array_merge($object->array_options, $expedition->array_options);
 				}
 			}
@@ -625,12 +624,14 @@ else	// View
 						$colspan = 2;
 						$mode = ($object->statut == 0) ? 'edit' : 'view';
 
-						$object->lines[$i]->fetch_optionals($object->lines[$i]->id);
+						$object->lines[$i]->fetch_optionals();
+
 						if ($action == 'create_delivery') {
 							$srcLine = new ExpeditionLigne($db);
 
 							$extrafields->fetch_name_optionals_label($srcLine->table_element);
-							$srcLine->fetch_optionals($expedition->lines[$i]->id);
+							$srcLine->id = $expedition->lines[$i]->id;
+							$srcLine->fetch_optionals();
 
 							$object->lines[$i]->array_options = array_merge($object->lines[$i]->array_options, $srcLine->array_options);
 						}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8d3812d5553..400ad73fad2 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1969,51 +1969,57 @@ function top_menu_bookmark()
         include_once DOL_DOCUMENT_ROOT.'/bookmarks/bookmarks.lib.php';
         $langs->load("bookmarks");
 
-        $html .= '<!-- div for bookmark link -->
-        <div id="topmenu-bookmark-dropdown" class="dropdown inline-block">
-            <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')">
-                <i class="fa fa-star" ></i>
-            </a>
-            <div class="dropdown-menu">
-                '.printDropdownBookmarksList().'
-            </div>
-        </div>';
+        if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+        	$html .= '<div id="topmenu-bookmark-dropdown" class="dropdown inline-block">';
+        	$html .= printDropdownBookmarksList();
+        	$html .= '</div>';
+        } else {
+	        $html .= '<!-- div for bookmark link -->
+	        <div id="topmenu-bookmark-dropdown" class="dropdown inline-block">
+	            <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')">
+	                <i class="fa fa-star" ></i>
+	            </a>
+	            <div class="dropdown-menu">
+	                '.printDropdownBookmarksList().'
+	            </div>
+	        </div>';
 
-        $html .= '
-        <!-- Code to show/hide the user drop-down -->
-        <script>
-        $( document ).ready(function() {
-            $(document).on("click", function(event) {
-                if (!$(event.target).closest("#topmenu-bookmark-dropdown").length) {
-					//console.log("close bookmark dropdown - we click outside");
-                    // Hide the menus.
-                    $("#topmenu-bookmark-dropdown").removeClass("open");
-                }
-            });
+	        $html .= '
+	        <!-- Code to show/hide the bookmark drop-down -->
+	        <script>
+	        $( document ).ready(function() {
+	            $(document).on("click", function(event) {
+	                if (!$(event.target).closest("#topmenu-bookmark-dropdown").length) {
+						//console.log("close bookmark dropdown - we click outside");
+	                    // Hide the menus.
+	                    $("#topmenu-bookmark-dropdown").removeClass("open");
+	                }
+	            });
 
-            $("#topmenu-bookmark-dropdown .dropdown-toggle").on("click", function(event) {
-				console.log("toggle bookmark dropdown");
-				openBookMarkDropDown();
-            });
+	            $("#topmenu-bookmark-dropdown .dropdown-toggle").on("click", function(event) {
+					console.log("toggle bookmark dropdown");
+					openBookMarkDropDown();
+	            });
 
-            // Key map shortcut
-            $(document).keydown(function(e){
-                  if( e.which === 77 && e.ctrlKey && e.shiftKey ){
-                     console.log(\'control + shift + m : trigger open bookmark dropdown\');
-                     openBookMarkDropDown();
-                  }
-            });
+	            // Key map shortcut
+	            $(document).keydown(function(e){
+	                  if( e.which === 77 && e.ctrlKey && e.shiftKey ){
+	                     console.log(\'control + shift + m : trigger open bookmark dropdown\');
+	                     openBookMarkDropDown();
+	                  }
+	            });
 
 
-            var openBookMarkDropDown = function() {
-                event.preventDefault();
-                $("#topmenu-bookmark-dropdown").toggleClass("open");
-                $("#top-bookmark-search-input").focus();
-            }
+	            var openBookMarkDropDown = function() {
+	                event.preventDefault();
+	                $("#topmenu-bookmark-dropdown").toggleClass("open");
+	                $("#top-bookmark-search-input").focus();
+	            }
 
-        });
-        </script>
-        ';
+	        });
+	        </script>
+	        ';
+        }
     }
     return $html;
 }
diff --git a/htdocs/margin/admin/margin.php b/htdocs/margin/admin/margin.php
index 84218b40a89..afef8de5cff 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -41,66 +41,66 @@ $action=GETPOST('action', 'alpha');
  */
 if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code=$reg[1];
-    if (dolibarr_set_const($db, $code, 1, 'yesno', 0, '', $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	$code=$reg[1];
+	if (dolibarr_set_const($db, $code, 1, 'yesno', 0, '', $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
 
 if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code=$reg[1];
-    if (dolibarr_del_const($db, $code, $conf->entity) > 0)
-    {
-        header("Location: ".$_SERVER["PHP_SELF"]);
-        exit;
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	$code=$reg[1];
+	if (dolibarr_del_const($db, $code, $conf->entity) > 0)
+	{
+		header("Location: ".$_SERVER["PHP_SELF"]);
+		exit;
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
 
 if ($action == 'remises')
 {
-    if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0)
-    {
-          setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0)
+	{
+		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
 
 if ($action == 'typemarges')
 {
-    if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
-    {
-          setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
+	{
+		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
 
 if ($action == 'contact')
 {
-    if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
-    {
-          setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
-    }
-    else
-    {
-        dol_print_error($db);
-    }
+	if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0)
+	{
+		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
+	}
+	else
+	{
+		dol_print_error($db);
+	}
 }
 
 /*
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index cc87e83d5c0..93eb7560aaa 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -401,7 +401,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
     	$result = $object->getLinesArray();
 
     	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="' . $_SESSION ['newtoken'].'">
+    	<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.'">
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index 6697fd15da1..9930dabb83f 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -409,7 +409,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
@@ -509,6 +509,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	    elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
 	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	    //if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 	    if (!empty($arrayfields['t.'.$key]['checked']))
 		{
diff --git a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index fdcd7ecc4fd..48ed6b4b2c6 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -32,7 +32,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 {
 	/**
 	 * Global test setup
-     * @return void
+	 * @return void
 	 */
 	public static function setUpBeforeClass()
 	{
@@ -41,7 +41,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Unit test setup
-     * @return void
+	 * @return void
 	 */
 	protected function setUp()
 	{
@@ -50,7 +50,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Verify pre conditions
-     * @return void
+	 * @return void
 	 */
 	protected function assertPreConditions()
 	{
@@ -59,7 +59,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * A sample test
-     * @return bool
+	 * @return bool
 	 */
 	public function testSomething()
 	{
@@ -70,7 +70,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Verify post conditions
-     * @return void
+	 * @return void
 	 */
 	protected function assertPostConditions()
 	{
@@ -79,7 +79,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Unit test teardown
-     * @return void
+	 * @return void
 	 */
 	protected function tearDown()
 	{
@@ -88,7 +88,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 
 	/**
 	 * Global test teardown
-     * @return void
+	 * @return void
 	 */
 	public static function tearDownAfterClass()
 	{
@@ -99,7 +99,7 @@ class MyObjectTest extends \PHPUnit_Framework_TestCase
 	 * Unsuccessful test
 	 *
 	 * @param  Exception $e    Exception
-     * @return void
+	 * @return void
 	 * @throws Exception
 	 */
 	protected function onNotSuccessfulTest(Exception $e)
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 572b5d8a2f7..ca17ce7677e 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -497,7 +497,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$object->fetchLines();
 
     	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="' . $_SESSION ['newtoken'].'">
+    	<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.'">
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index e14053075cb..6a4abe24019 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -398,7 +398,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
@@ -418,7 +418,7 @@ foreach ($object->fields as $key => $val)
 		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]).'">';
+		elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
 		print '</td>';
 	}
 }
@@ -498,6 +498,7 @@ while ($i < ($limit ? min($num, $limit) : $num))
 	    elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 
 	    if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	    if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
 
 	    if (!empty($arrayfields['t.'.$key]['checked']))
 		{
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index d3b589fe88a..2085678f583 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2020  Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  * Copyright (C) 2015       Florian Henry       <florian.henry@open-concept.pro>
  * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
@@ -29,6 +29,7 @@
 require_once DOL_DOCUMENT_ROOT .'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT .'/core/class/commonobjectline.class.php';
 
+
 /**
  * Class Currency
  *
@@ -92,6 +93,7 @@ class MultiCurrency extends CommonObject
 	 */
 	public $rate;
 
+
 	/**
 	 * Constructor
 	 *
@@ -99,7 +101,7 @@ class MultiCurrency extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		$this->db = &$db;
+		$this->db = $db;
 
 		return 1;
 	}
@@ -107,16 +109,15 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Create object into database
 	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $trigger true=launch triggers after, false=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
+	 * @param  User $user      	User that creates
+	 * @param  bool $trigger 	true=launch triggers after, false=disable triggers
+	 * @return int 				<0 if KO, Id of created object if OK
 	 */
 	public function create(User $user, $trigger = true)
 	{
 		global $conf,$langs;
 
-		dol_syslog('Currency::create', LOG_DEBUG);
+		dol_syslog('MultiCurrency::create', LOG_DEBUG);
 
 		$error = 0;
 
@@ -152,7 +153,7 @@ class MultiCurrency extends CommonObject
 		if (!$resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog('Currency::create ' . join(',', $this->errors), LOG_ERR);
+			dol_syslog('MultiCurrency::create ' . join(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error) {
@@ -180,14 +181,13 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Load object in memory from the database
 	 *
-	 * @param int    $id  Id object
-	 * @param string $code code
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 * @param int    $id  		Id object
+	 * @param string $code 		code
+	 * @return int 				<0 if KO, 0 if not found, >0 if OK
 	 */
 	public function fetch($id, $code = null)
 	{
-		dol_syslog('Currency::fetch', LOG_DEBUG);
+		dol_syslog('MultiCurrency::fetch', LOG_DEBUG);
 
 		global $conf;
 
@@ -224,7 +224,7 @@ class MultiCurrency extends CommonObject
 			}
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog('Currency::fetch ' . join(',', $this->errors), LOG_ERR);
+			dol_syslog('MultiCurrency::fetch ' . join(',', $this->errors), LOG_ERR);
 
 			return -1;
 		}
@@ -260,7 +260,7 @@ class MultiCurrency extends CommonObject
 			return $num;
 		} else {
 			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog('Currency::fetchAllCurrencyRate ' . join(',', $this->errors), LOG_ERR);
+			dol_syslog('MultiCurrency::fetchAllCurrencyRate ' . join(',', $this->errors), LOG_ERR);
 
 			return - 1;
 		}
@@ -269,16 +269,15 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Update object into database
 	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $trigger true=launch triggers after, false=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
+	 * @param  User $user      	User that modifies
+	 * @param  bool $trigger 	true=launch triggers after, false=disable triggers
+	 * @return int 				<0 if KO, >0 if OK
 	 */
 	public function update(User $user, $trigger = true)
 	{
 		$error = 0;
 
-		dol_syslog('Currency::update', LOG_DEBUG);
+		dol_syslog('MultiCurrency::update', LOG_DEBUG);
 
 		// Clean parameters
 		$this->name = trim($this->name);
@@ -287,7 +286,7 @@ class MultiCurrency extends CommonObject
 		// Check parameters
 		if (empty($this->code)) {
 			$error++;
-			dol_syslog('Currency::update $this->code can not be empty', LOG_ERR);
+			dol_syslog('MultiCurrency::update $this->code can not be empty', LOG_ERR);
 
 			return -1;
 		}
@@ -298,14 +297,13 @@ class MultiCurrency extends CommonObject
 		$sql .= ' code=\''.$this->db->escape($this->code).'\'';
 		$sql .= ' WHERE rowid=' . $this->id;
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
 		$this->db->begin();
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error ++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog('Currency::update ' . join(',', $this->errors), LOG_ERR);
+			dol_syslog('MultiCurrency::update ' . join(',', $this->errors), LOG_ERR);
 		}
 
 		if (!$error && $trigger) {
@@ -329,14 +327,13 @@ class MultiCurrency extends CommonObject
 	 * Delete object in database
 	 *
 	 * @param bool $trigger true=launch triggers after, false=disable triggers
-	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function delete($trigger = true)
 	{
 		global $user;
 
-		dol_syslog('Currency::delete', LOG_DEBUG);
+		dol_syslog('MultiCurrency::delete', LOG_DEBUG);
 
 		$error = 0;
 
@@ -363,7 +360,7 @@ class MultiCurrency extends CommonObject
 			if (!$resql) {
 				$error ++;
 				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog('Currency::delete ' . join(',', $this->errors), LOG_ERR);
+				dol_syslog('MultiCurrency::delete ' . join(',', $this->errors), LOG_ERR);
 			}
 		}
 
@@ -398,16 +395,15 @@ class MultiCurrency extends CommonObject
 	}
 
 	/**
-	 * Delete rate in database
+	 * Add a Rate into database
 	 *
 	 * @param double	$rate	rate value
-	 *
-	 * @return int -1 if KO, 1 if OK
+	 * @return int 				-1 if KO, 1 if OK
 	 */
 	public function addRate($rate)
 	{
 	 	$currencyRate = new CurrencyRate($this->db);
-		$currencyRate->rate = $rate;
+		$currencyRate->rate = price2num($rate);
 
 		if ($currencyRate->create($this->id) > 0)
 		{
@@ -427,7 +423,6 @@ class MultiCurrency extends CommonObject
 	 *
 	 * @param	string	$code	currency code
 	 * @param	double	$rate	new rate
-	 *
 	 * @return int -1 if KO, 1 if OK, 2 if label found and OK
 	 */
     public function addRateFromDolibarr($code, $rate)
@@ -459,10 +454,9 @@ class MultiCurrency extends CommonObject
     }
 
 	 /**
-	 * Add new entry into llx_multicurrency_rate to historise
+	 * Add new entry into llx_multicurrency_rate
 	 *
 	 * @param double	$rate	rate value
-	  *
 	 * @return int <0 if KO, >0 if OK
      */
     public function updateRate($rate)
@@ -628,11 +622,11 @@ class MultiCurrency extends CommonObject
 	}
 
 	/**
-	 * Sync rates from api
+	 * Sync rates from API
 	 *
 	 * @param 	string  $key                Key to use. Come from $conf->global->MULTICURRENCY_APP_ID.
 	 * @param   int     $addifnotfound      Add if not found
-     * @return  void
+     * @return  int							<0 if KO, >0 if OK
 	 */
 	public static function syncRates($key, $addifnotfound = 0)
 	{
@@ -672,11 +666,15 @@ class MultiCurrency extends CommonObject
 					}
 				}
 			}
-		}
+
+			return 1;
+        }
 		else
 		{
 		    dol_syslog("Failed to call endpoint ".$response->error->info, LOG_WARNING);
 			setEventMessages($langs->trans('multicurrency_syncronize_error', $response->error->info), null, 'errors');
+
+			return -1;
 		}
 	}
 
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/fonctions.php
index eb1a20800ce..369840efc71 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/fonctions.php
@@ -47,11 +47,11 @@ function opensurvey_prepare_head(Opensurveysondage $object)
 	$head[1][2] = 'preview';
 	$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, 'opensurveypoll');
+	// 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, 'opensurveypoll');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'opensurveypoll', 'remove');
 
@@ -89,15 +89,11 @@ function llxHeaderSurvey($title, $head = "", $disablejs = 0, $disablehead = 0, $
 	print '<input type="hidden" name="token" value="'.newToken().'">'."\n";
 	print "\n";
 
-
 	// Show logo (search order: logo defined by PAYMENT_LOGO_suffix, then PAYMENT_LOGO, then small company logo, large company logo, theme logo, common logo)
 	$width = 0;
 	// Define logo and logosmall
 	$logosmall = $mysoc->logo_small;
 	$logo = $mysoc->logo;
-	$paramlogo = 'ONLINE_PAYMENT_LOGO_'.$suffix;
-	if (!empty($conf->global->$paramlogo)) $logosmall = $conf->global->$paramlogo;
-	elseif (!empty($conf->global->ONLINE_PAYMENT_LOGO)) $logosmall = $conf->global->ONLINE_PAYMENT_LOGO;
 	//print '<!-- Show logo (logosmall='.$logosmall.' logo='.$logo.') -->'."\n";
 	// Define urllogo
 	$urllogo = '';
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index ec7ec4e60f6..37af5b1a7f4 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -52,17 +52,17 @@ if ($action == 'setvalue' && $user->admin)
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "PAYBOX_PBX_IDENTIFIANT", GETPOST('PAYBOX_PBX_IDENTIFIANT', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-    if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
+	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
+	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (! $result > 0) $error++;
+	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0) $error++;
 	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
 	if (! $result > 0) $error++;
diff --git a/htdocs/paypal/lib/paypalfunctions.lib.php b/htdocs/paypal/lib/paypalfunctions.lib.php
index 258ca919142..226875c6238 100644
--- a/htdocs/paypal/lib/paypalfunctions.lib.php
+++ b/htdocs/paypal/lib/paypalfunctions.lib.php
@@ -24,14 +24,14 @@
 
 if (session_id() == "")
 {
-    session_start();
-    if (ini_get('register_globals'))    // To solve bug in using $_SESSION
-    {
-        foreach ($_SESSION as $key=>$value)
-        {
-            if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
-        }
-    }
+	session_start();
+	if (ini_get('register_globals'))    // To solve bug in using $_SESSION
+	{
+		foreach ($_SESSION as $key=>$value)
+		{
+			if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+		}
+	}
 }
 
 // ==================================
@@ -50,13 +50,13 @@ $API_version="56";
  */
 if (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'))		// We can force sand box with param 'forcesandbox'
 {
-    $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
-    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
+	$API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
+	$API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
 }
 else
 {
-    $API_Endpoint = "https://api-3t.paypal.com/nvp";
-    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
+	$API_Endpoint = "https://api-3t.paypal.com/nvp";
+	$API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
 }
 
 // Clean parameters
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 5c5322c7184..5372c70d73b 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -50,19 +50,19 @@ print $langs->trans("DirectPrintingJobsDesc").'<br><br>';
 $object = new PrintingDriver($db);
 $result = $object->listDrivers($db, 10);
 foreach ($result as $driver) {
-    require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
-    $classname = 'printing_'.$driver;
-    $langs->load($driver);
-    $printer = new $classname($db);
-    if ($conf->global->{$printer->active}) {
-        //$printer->listJobs('commande');
-        $result = $printer->listJobs();
-        print $printer->resprint;
+	require_once DOL_DOCUMENT_ROOT.'/core/modules/printing/'.$driver.'.modules.php';
+	$classname = 'printing_'.$driver;
+	$langs->load($driver);
+	$printer = new $classname($db);
+	if ($conf->global->{$printer->active}) {
+		//$printer->listJobs('commande');
+		$result = $printer->listJobs();
+		print $printer->resprint;
 
-        if ($result > 0) {
-            setEventMessages($printer->error, $printer->errors, 'errors');
-        }
-    }
+		if ($result > 0) {
+			setEventMessages($printer->error, $printer->errors, 'errors');
+		}
+	}
 }
 
 // End of page
diff --git a/htdocs/printing/lib/printing.lib.php b/htdocs/printing/lib/printing.lib.php
index 26a66acad7a..c899eb105b1 100644
--- a/htdocs/printing/lib/printing.lib.php
+++ b/htdocs/printing/lib/printing.lib.php
@@ -32,46 +32,46 @@
  */
 function printingAdminPrepareHead($mode)
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=config";
-    $head[$h][1] = $langs->trans("ListDrivers");
-    $head[$h][2] = 'config';
-    $h++;
+	$head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=config";
+	$head[$h][1] = $langs->trans("ListDrivers");
+	$head[$h][2] = 'config';
+	$h++;
 
-    if ($mode == 'setup') {
-        $head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=setup&driver=".GETPOST('driver', 'alpha');
-        $head[$h][1] = $langs->trans("SetupDriver");
-        $head[$h][2] = 'setup';
-        $h++;
-    }
+	if ($mode == 'setup') {
+		$head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=setup&driver=".GETPOST('driver', 'alpha');
+		$head[$h][1] = $langs->trans("SetupDriver");
+		$head[$h][2] = 'setup';
+		$h++;
+	}
 
-    if ($mode == 'test') {
-        $head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=test&driver=".GETPOST('driver', 'alpha');
-        $head[$h][1] = $langs->trans("TargetedPrinter");
-        $head[$h][2] = 'test';
-        $h++;
-    }
+	if ($mode == 'test') {
+		$head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=test&driver=".GETPOST('driver', 'alpha');
+		$head[$h][1] = $langs->trans("TargetedPrinter");
+		$head[$h][2] = 'test';
+		$h++;
+	}
 
-    /** TODO This feature seem to be not ready yet.
+	/** TODO This feature seem to be not ready yet.
     $head[$h][0] = DOL_URL_ROOT."/printing/admin/printing.php?mode=userconf";
     $head[$h][1] = $langs->trans("UserConf");
     $head[$h][2] = 'userconf';
     $h++;
-    */
+	 */
 
-    //$object=new stdClass();
+	//$object=new stdClass();
 
-    // 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,'printingadmin');
+	// 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,'printingadmin');
 
-    //complete_head_from_modules($conf,$langs,$object,$head,$h,'printing','remove');
+	//complete_head_from_modules($conf,$langs,$object,$head,$h,'printing','remove');
 
-    return $head;
+	return $head;
 }
diff --git a/htdocs/product/admin/product_tools.php b/htdocs/product/admin/product_tools.php
index 6a3f8a898eb..694d7862479 100644
--- a/htdocs/product/admin/product_tools.php
+++ b/htdocs/product/admin/product_tools.php
@@ -201,7 +201,7 @@ if ($action == 'convert')
 			{
 				$obj = $db->fetch_object($resql);
 
-                $objectstatic2 = new ProductFournisseur($db);          // Object init must be into loop to avoid to get value of previous step
+				$objectstatic2 = new ProductFournisseur($db);          // Object init must be into loop to avoid to get value of previous step
 				$ret=$objectstatic2->fetch_product_fournisseur_price($obj->rowid);
 				if ($ret > 0)
 				{
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index d9e0295c7a2..b2cab72a0a1 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1487,7 +1487,7 @@ else
                 // Default warehouse
                 print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';
                 print $formproduct->selectWarehouses($object->fk_default_warehouse, 'fk_default_warehouse', 'warehouseopen', 1);
-                print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'">'.$langs->trans("AddWarehouse").'</a>';
+                print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddWarehouse").'"></span></a>';
                 print '</td>';
                 /*
                 print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';
diff --git a/htdocs/product/dynamic_price/editor.php b/htdocs/product/dynamic_price/editor.php
index 42872f22e1e..f99120836c7 100644
--- a/htdocs/product/dynamic_price/editor.php
+++ b/htdocs/product/dynamic_price/editor.php
@@ -73,9 +73,9 @@ if ($action == 'add')
 		if ($result == 0) //No existing entry found with title, ok
 		{
 			//Check the expression validity by parsing it
-            $priceparser = new PriceParser($db);
-            $price_result = $priceparser->testExpression($id, $expression);
-            if ($price_result < 0) { //Expression is not valid
+			$priceparser = new PriceParser($db);
+			$price_result = $priceparser->testExpression($id, $expression);
+			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
 			}
 			else
@@ -113,9 +113,9 @@ if ($action == 'update')
 		if ($result == 0 || $result == $eid) //No existing entry found with title or existing one is the current one, ok
 		{
 			//Check the expression validity by parsing it
-            $priceparser = new PriceParser($db);
-            $price_result = $priceparser->testExpression($id, $expression);
-            if ($price_result < 0) { //Expression is not valid
+			$priceparser = new PriceParser($db);
+			$price_result = $priceparser->testExpression($id, $expression);
+			if ($price_result < 0) { //Expression is not valid
 				setEventMessages($priceparser->translatedError(), null, 'errors');
 			}
 			else
@@ -149,7 +149,7 @@ if ($action == 'delete')
 {
 	if ($eid != 0)
 	{
-	    $price_expression->fetch($eid);
+		$price_expression->fetch($eid);
 		$result = $price_expression->delete($user);
 		if ($result < 0)
 		{
@@ -200,7 +200,7 @@ $help_text.= '<br><br>'.$langs->trans("PriceExpressionEditorHelp3");
 $help_text.= '<br><br>'.$langs->trans("PriceExpressionEditorHelp4");
 $help_text.= '<br><br>'.$langs->trans("PriceExpressionEditorHelp5");
 foreach ($price_globals->listGlobalVariables() as $entry) {
-    $help_text.= '<br><b>#globals_'.$entry->code.'#</b> '.$entry->description.' = '.$entry->value;
+	$help_text.= '<br><b>#globals_'.$entry->code.'#</b> '.$entry->description.' = '.$entry->value;
 }
 
 //Price expression editor
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 7ff90dc296a..22b4ac6e651 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2016      Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2019      Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019      Tim Otte			    <otte@meuser.it>
+ * Copyright (C) 2020      Pierre Ardoin        <mapiolca@me.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
@@ -1070,6 +1071,7 @@ SCRIPT;
 
 						// Modify-Remove
 						print '<td class="center nowraponall">';
+
 						if ($usercancreate)
 						{
 							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=update_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 770a02fded5..e0fce722ee7 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -61,15 +61,15 @@ $staticproduct=new Product($db);
 $helpurl='';
 if ($type == '0')
 {
-    $helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	$helpurl='EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
 }
 elseif ($type == '1')
 {
-    $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 else
 {
-    $helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	$helpurl='EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
 }
 $title=$langs->trans("Statistics");
 
@@ -130,7 +130,7 @@ $sql.= " GROUP BY p.rowid, p.label, p.ref, p.fk_product_type";
 $result=$db->query($sql);
 if ($result)
 {
-    $totalnboflines = $db->num_rows($result);
+	$totalnboflines = $db->num_rows($result);
 }
 
 $sql.= $db->order($sortfield, $sortorder);
@@ -139,23 +139,23 @@ $sql.= $db->plimit($limit+1, $offset);
 $resql=$db->query($sql);
 if ($resql)
 {
-    $num = $db->num_rows($resql);
-    $i = 0;
+	$num = $db->num_rows($resql);
+	$i = 0;
 
-    while ($i < $num)
-    {
-        $objp = $db->fetch_object($resql);
+	while ($i < $num)
+	{
+		$objp = $db->fetch_object($resql);
 
-        $infoprod[$objp->rowid]=array('type'=>$objp->type, 'ref'=>$objp->ref, 'label'=>$objp->label);
-        $infoprod[$objp->rowid]['nblineproposal']=$objp->c;
+		$infoprod[$objp->rowid]=array('type'=>$objp->type, 'ref'=>$objp->ref, 'label'=>$objp->label);
+		$infoprod[$objp->rowid]['nblineproposal']=$objp->c;
 
-        $i++;
-    }
-    $db->free($resql);
+		$i++;
+	}
+	$db->free($resql);
 }
 else
 {
-    dol_print_error($db);
+	dol_print_error($db);
 }
 //var_dump($infoprod);
 
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index a6697701a68..3f6a89cbddb 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1151,7 +1151,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 	print load_fiche_titre($langs->trans("UpdateVAT"), '');
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update_vat">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 
@@ -1185,7 +1185,7 @@ if ($action == 'edit_price' && $object->getRights()->creer)
 	{
 	    print '<!-- Edit price -->'."\n";
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update_price">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
@@ -1660,7 +1660,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		print load_fiche_titre($langs->trans('PriceByCustomer'));
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
@@ -1747,7 +1747,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES))
 		}
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update_customer_price_confirm">';
 		print '<input type="hidden" name="lineid" value="'.$prodcustprice->id.'">';
 
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 35e16e5c840..fd85bcfd5b0 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -45,6 +45,7 @@ $result=restrictedArea($user, 'stock');
  */
 
 $producttmp=new Product($db);
+$warehouse=new Entrepot($db);
 
 $help_url='EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 llxHeader("", $langs->trans("Stocks"), $help_url);
@@ -65,18 +66,19 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     print '<table class="noborder nohover centpercent">';
     print "<tr class=\"liste_titre\">";
     print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
-    print "<tr ".$bc[false]."><td>";
+    print '<tr class="oddevene"><td>';
     print $langs->trans("Warehouse").':</td><td><input class="flat" type="text" size="18" name="sall"></td><td rowspan="2"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
     print "</table></div></form><br>";
 }
 
+$max = 15;
 
-$sql = "SELECT e.ref as label, e.rowid, e.statut";
+$sql = "SELECT e.rowid, e.ref as label, e.lieu, e.statut as status";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= " WHERE e.statut in (0,1)";
 $sql.= " AND e.entity IN (".getEntity('stock').")";
 $sql.= $db->order('e.statut', 'DESC');
-$sql.= $db->plimit(15, 0);
+$sql.= $db->plimit($max + 1, 0);
 
 $result = $db->query($sql);
 
@@ -92,20 +94,31 @@ if ($result)
 
     if ($num)
     {
-        $entrepot=new Entrepot($db);
-
-        while ($i < $num)
+        while ($i < min($max, $num))
         {
             $objp = $db->fetch_object($result);
 
+            $warehouse->id = $objp->rowid;
+            $warehouse->statut = $objp->status;
+            $warehouse->label = $objp->label;
+            $warehouse->lieu = $objp->lieu;
+
             print '<tr class="oddeven">';
-            print "<td><a href=\"card.php?id=$objp->rowid\">".img_object($langs->trans("ShowStock"), "stock")." ".$objp->label."</a></td>\n";
-            print '<td class="right">'.$entrepot->LibStatut($objp->statut, 5).'</td>';
+            print '<td>';
+            print $warehouse->getNomUrl(1);
+            print '</td>'."\n";
+            print '<td class="right">';
+            print $warehouse->getLibStatut(5);
+            print '</td>';
             print "</tr>\n";
             $i++;
         }
         $db->free($result);
     }
+    if ($num > $max) {
+    	print '<tr><td><span class="opacitymedium">'.$langs->trans("More").'...</span></td><td></td></tr>';
+    }
+
     print "</table>";
     print '</div>';
 }
@@ -119,10 +132,10 @@ else
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
 
-// Last movements
+// Latest movements
 $max=10;
 $sql = "SELECT p.rowid, p.label as produit, p.tobatch, p.tosell, p.tobuy,";
-$sql.= " e.ref as stock, e.rowid as entrepot_id,";
+$sql.= " e.ref as warehouse_ref, e.rowid as warehouse_id, e.ref as warehouse_label, e.lieu, e.statut as warehouse_status,";
 $sql.= " m.value as qty, m.datem, m.batch, m.eatby, m.sellby";
 $sql.= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql.= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
@@ -166,8 +179,14 @@ if ($resql)
 		$producttmp->status_sell = $objp->tosell;
 		$producttmp->status_buy = $objp->tobuy;
 
+		$warehouse->id = $objp->warehouse_id;
+		$warehouse->ref = $objp->warehouse_ref;
+		$warehouse->statut = $objp->warehouse_status;
+		$warehouse->label = $objp->warehouse_label;
+		$warehouse->lieu = $objp->lieu;
+
 		print '<tr class="oddeven">';
-		print '<td>'.dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>';
+		print '<td class="nowraponall">'.dol_print_date($db->jdate($objp->datem), 'dayhour').'</td>';
 		print '<td class="tdoverflowmax200">';
 		print $producttmp->getNomUrl(1);
 		print "</td>\n";
@@ -177,9 +196,9 @@ if ($resql)
 			print '<td>'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
 			print '<td>'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
 		}
-		print '<td class="tdoverflowmax200"><a href="card.php?id='.$objp->entrepot_id.'">';
-		print img_object($langs->trans("ShowWarehouse"), "stock").' '.$objp->stock;
-		print "</a></td>\n";
+		print '<td class="tdoverflowmax200">';
+		print $warehouse->getNomUrl(1);
+		print "</td>\n";
 		print '<td class="right">';
 		if ($objp->qty > 0) print '+';
 		print $objp->qty.'</td>';
@@ -190,6 +209,8 @@ if ($resql)
 
 	print "</table>";
     print '</div>';
+} else {
+	dol_print_error($db);
 }
 
 //print '</td></tr></table>';
diff --git a/htdocs/product/stock/lib/replenishment.lib.php b/htdocs/product/stock/lib/replenishment.lib.php
index a23b99b9293..798f21004c7 100644
--- a/htdocs/product/stock/lib/replenishment.lib.php
+++ b/htdocs/product/stock/lib/replenishment.lib.php
@@ -32,45 +32,45 @@ require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
  */
 function dolDispatchToDo($order_id)
 {
-    global $db;
+	global $db;
 
-    $dispatched = array();
-    $ordered = array();
+	$dispatched = array();
+	$ordered = array();
 
-    // Count nb of quantity dispatched per product
-    $sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch';
-    $sql.= ' WHERE fk_commande = ' . $order_id;
-    $sql.= ' GROUP BY fk_product';
-    $sql.= ' ORDER by fk_product';
-    $resql = $db->query($sql);
-    if ($resql && $db->num_rows($resql))
-    {
-        while ($obj = $db->fetch_object($resql))
-            $dispatched[$obj->fk_product] = $obj;
-    }
+	// Count nb of quantity dispatched per product
+	$sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur_dispatch';
+	$sql.= ' WHERE fk_commande = ' . $order_id;
+	$sql.= ' GROUP BY fk_product';
+	$sql.= ' ORDER by fk_product';
+	$resql = $db->query($sql);
+	if ($resql && $db->num_rows($resql))
+	{
+		while ($obj = $db->fetch_object($resql))
+			$dispatched[$obj->fk_product] = $obj;
+	}
 
-    // Count nb of quantity to dispatch per product
-    $sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseurdet';
-    $sql.= ' WHERE fk_commande = ' . $order_id;
-    $sql.= ' AND fk_product > 0';
-    if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= ' AND product_type = 0';
-    $sql.= ' GROUP BY fk_product';
-    $sql.= ' ORDER by fk_product';
-    $resql = $db->query($sql);
-    if ($resql && $db->num_rows($resql))
-    {
-        while ($obj = $db->fetch_object($resql))
-            $ordered[$obj->fk_product] = $obj;
-    }
+	// Count nb of quantity to dispatch per product
+	$sql = 'SELECT fk_product, SUM(qty) FROM ' . MAIN_DB_PREFIX . 'commande_fournisseurdet';
+	$sql.= ' WHERE fk_commande = ' . $order_id;
+	$sql.= ' AND fk_product > 0';
+	if (empty($conf->global->STOCK_SUPPORTS_SERVICES)) $sql.= ' AND product_type = 0';
+	$sql.= ' GROUP BY fk_product';
+	$sql.= ' ORDER by fk_product';
+	$resql = $db->query($sql);
+	if ($resql && $db->num_rows($resql))
+	{
+		while ($obj = $db->fetch_object($resql))
+			$ordered[$obj->fk_product] = $obj;
+	}
 
-    $todispatch=0;
-    foreach ($ordered as $key => $val)
-    {
+	$todispatch=0;
+	foreach ($ordered as $key => $val)
+	{
 		if ($ordered[$key] > $dispatched[$key]) $todispatch++;
-    }
+	}
 
-    return ($todispatch ? true : false);
-    //return true;
+	return ($todispatch ? true : false);
+	//return true;
 }
 
 /**
@@ -80,30 +80,30 @@ function dolDispatchToDo($order_id)
  */
 function dispatchedOrders()
 {
-    global $db;
+	global $db;
 
-    $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur';
-    $resql = $db->query($sql);
-    $resarray = array();
-    if ($resql && $db->num_rows($resql) > 0)
-    {
-        while ($obj = $db->fetch_object($resql))
-        {
-            if (! dolDispatchToDo($obj->rowid))
-            {
-                $resarray[] = $obj->rowid;
-            }
-        }
-    }
+	$sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . 'commande_fournisseur';
+	$resql = $db->query($sql);
+	$resarray = array();
+	if ($resql && $db->num_rows($resql) > 0)
+	{
+		while ($obj = $db->fetch_object($resql))
+		{
+			if (! dolDispatchToDo($obj->rowid))
+			{
+				$resarray[] = $obj->rowid;
+			}
+		}
+	}
 
-    if (count($resarray))
-    {
-        $res = '(' . implode(',', $resarray) . ')';
-    } else {
-        //hack to make sure ordered SQL request won't syntax error
-        $res = '(0)';
-    }
-    return $res;
+	if (count($resarray))
+	{
+		$res = '(' . implode(',', $resarray) . ')';
+	} else {
+		//hack to make sure ordered SQL request won't syntax error
+		$res = '(0)';
+	}
+	return $res;
 }
 
 /**
@@ -159,16 +159,16 @@ function ordered($product_id)
  */
 function getProducts($order_id)
 {
-    global $db;
-    $order = new CommandeFournisseur($db);
-    $f = $order->fetch($order_id);
-    $products = array();
-    if($f) {
-        foreach($order->lines as $line) {
-            if (!in_array($line->fk_product, $products)) {
-                $products[] = $line->fk_product;
-            }
-        }
-    }
-    return $products;
+	global $db;
+	$order = new CommandeFournisseur($db);
+	$f = $order->fetch($order_id);
+	$products = array();
+	if($f) {
+		foreach($order->lines as $line) {
+			if (!in_array($line->fk_product, $products)) {
+				$products[] = $line->fk_product;
+			}
+		}
+	}
+	return $products;
 }
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 0b145c7ca10..39f42575e25 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -369,7 +369,7 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 // Fields title search
 // --------------------------------------------------------------------
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 7f61b9d49ab..63115350bbc 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -85,16 +85,14 @@ $morehtml .= '<option name="mine" value="'.$user->id.'"'.(($search_project_user
 $morehtml .= '</SELECT>';
 $morehtml .= '<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
 
-print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'project', 0, $morehtml);
-//print load_fiche_titre($title, '', 'project');
-
-if ($mine) print $langs->trans("MyTasksDesc").'<br><br>';
+if ($mine) $tooltiphelp = $langs->trans("MyTasksDesc");
 else
 {
-	if ($user->rights->projet->all->lire && !$socid) print $langs->trans("TasksDesc").'<br><br>';
-	else print $langs->trans("TasksPublicDesc").'<br><br>';
+	if ($user->rights->projet->all->lire && !$socid) $tooltiphelp = $langs->trans("TasksDesc");
+	else $tooltiphelp = $langs->trans("TasksPublicDesc");
 }
 
+print_barre_liste($form->textwithpicto($title, $tooltiphelp), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'project', 0, $morehtml);
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index 2489104eb34..db6efca4721 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -486,11 +486,11 @@ dol_fiche_end();
 
 print '<div class="floatright right'.($conf->dol_optimize_smallscreen ? ' centpercent' : '').'">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to.
 
-print '<div class="colorback float valignmiddle">';
+print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
 if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 print '<div class="taskiddiv inline-block">';
-$formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, 1, 1, 0, 0, '', '', 'all', $usertoprocess);
+$formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
 print '</div>';
 print ' ';
 print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
@@ -606,8 +606,8 @@ if (!empty($arrayfields['t.progress']['checked']))
 /*print '<td class="right maxwidth100">'.$langs->trans("TimeSpent").'</td>';
 if ($usertoprocess->id == $user->id) print '<td class="right maxwidth100">'.$langs->trans("TimeSpentByYou").'</td>';
 else print '<td class="right maxwidth100">'.$langs->trans("TimeSpentByUser").'</td>';*/
-print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</th>';
-print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>('.dol_trunc($usertoprocess->firstname, 10).')' : '').'</th>';
+print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></th>';
+print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="opacitymedium">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</th>';
 print '<th class="center leftborder">'.$langs->trans("HourStart").'</td>';
 
 // By default, we can edit only tasks we are assigned to
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index d121b39b683..da0459f9521 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -21,7 +21,7 @@
 /**
  *	\file       htdocs/projet/activity/permonth.php
  *	\ingroup    projet
- *	\brief      List activities of tasks (per week entry)
+ *	\brief      List activities of tasks (per month entry)
  */
 
 require "../../main.inc.php";
@@ -410,11 +410,11 @@ dol_fiche_end();
 
 print '<div class="floatright right'.($conf->dol_optimize_smallscreen?' centpercent':'').'">'.$nav.'</div>';     // We move this before the assign to components so, the default submit button is not the assign to.
 
-print '<div class="colorback float valignmiddle">';
+print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
 if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 print '<div class="taskiddiv inline-block">';
-$formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1);
+$formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1);
 print '</div>';
 print ' ';
 print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
@@ -480,8 +480,7 @@ print '<td class="liste_titre"></td>';
 print '<td class="liste_titre right"><input type="text" size="4" name="search_declared_progress" value="'.dol_escape_htmltag($search_declared_progress).'"></td>';
 print '<td class="liste_titre"></td>';
 print '<td class="liste_titre"></td>';
-$countWeek = count($TWeek);
-for ($idw=0;$idw<$countWeek;$idw++)
+foreach ($TWeek as $week_number)
 {
 	print '<td class="liste_titre"></td>';
 }
@@ -501,8 +500,8 @@ print '<td align="right" class="maxwidth75">'.$langs->trans("ProgressDeclared").
 /*print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'</td>';
  if ($usertoprocess->id == $user->id) print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByYou").'</td>';
  else print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpentByUser").'</td>';*/
-print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</td>';
-print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>('.dol_trunc($usertoprocess->firstname, 10).')' : '').'</td>';
+print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></td>';
+print '<td align="right" class="maxwidth75">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="opacitymedium">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</td>';
 
 foreach ($TWeek as $week_number)
 {
@@ -516,6 +515,8 @@ $colspan=5;
 // By default, we can edit only tasks we are assigned to
 $restrictviewformytask=(empty($conf->global->PROJECT_TIME_SHOW_TASK_NOT_ASSIGNED)?1:0);
 
+$isavailable = array();
+
 if (count($tasksarray) > 0)
 {
 	//var_dump($tasksarray);				// contains only selected tasks
@@ -616,6 +617,7 @@ print "</table>";
 print '</div>';
 
 print '<input type="hidden" id="numberOfLines" name="numberOfLines" value="'.count($tasksarray).'"/>'."\n";
+print '<input type="hidden" id="numberOfFirstLine" name="numberOfFirstLine" value="'.(reset($TWeek)).'"/>'."\n";
 
 print '<div class="center">';
 print '<input type="submit" class="button" name="save" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
@@ -639,11 +641,9 @@ if ($conf->use_javascript_ajax)
 					}
 				});'."\n";
 
-	$idw=0;
-	while ($idw < 7)
+	foreach ($TWeek as $week_number)
 	{
-		print '    updateTotal('.$idw.',\''.$modeinput.'\');';
-		$idw++;
+		print '    updateTotal('.$week_number.',\''.$modeinput.'\');';
 	}
 	print "\n});\n";
 	print '</script>';
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 563b7ca19c9..3bb024b29f3 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -309,6 +309,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 						$object->timespent_fk_user = $usertoprocess->id;
 						$object->timespent_date = dol_time_plus_duree($firstdaytoshow, $key, 'd');
 						$object->timespent_datehour = $object->timespent_date;
+						$object->timespent_note = $object->description;
 
 						$result = $object->addTimeSpent($user);
 						if ($result < 0)
@@ -502,11 +503,11 @@ dol_fiche_end();
 
 print '<div class="floatright right'.($conf->dol_optimize_smallscreen ? ' centpercent' : '').'">'.$nav.'</div>'; // We move this before the assign to components so, the default submit button is not the assign to.
 
-print '<div class="colorback float valignmiddle">';
+print '<div class="colorbacktimesheet float valignmiddle">';
 $titleassigntask = $langs->transnoentities("AssignTaskToMe");
 if ($usertoprocess->id != $user->id) $titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 print '<div class="taskiddiv inline-block">';
-$formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, 1, 1, 0, 0, '', '', 'all', $usertoprocess);
+$formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
 print '</div>';
 print ' ';
 print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
@@ -659,8 +660,8 @@ if (!empty($arrayfields['t.progress']['checked']))
 /*print '<td class="maxwidth75 right">'.$langs->trans("TimeSpent").'</td>';
  if ($usertoprocess->id == $user->id) print '<td class="maxwidth75 right">'.$langs->trans("TimeSpentByYou").'</td>';
  else print '<td class="maxwidth75 right">'.$langs->trans("TimeSpentByUser").'</td>';*/
-print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").'<br>('.$langs->trans("Everybody").')</th>';
-print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br>('.dol_trunc($usertoprocess->firstname, 10).')' : '').'</th>';
+print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").'<br><span class="opacitymedium">'.$langs->trans("Everybody").'</span></th>';
+print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="opacitymedium">'.dol_trunc($usertoprocess->firstname, 10).'</span>' : '').'</th>';
 
 for ($idw = 0; $idw < 7; $idw++)
 {
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 54075318246..d8f020708df 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2002-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013	   Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014-2017 Marcos García        <marcosgdf@gmail.com>
@@ -701,7 +701,7 @@ class Project extends CommonObject
         		'propal'=>'fk_projet', 'commande'=>'fk_projet', 'facture'=>'fk_projet',
         		'supplier_proposal'=>'fk_projet', 'commande_fournisseur'=>'fk_projet', 'facture_fourn'=>'fk_projet',
         		'expensereport_det'=>'fk_projet', 'contrat'=>'fk_projet', 'fichinter'=>'fk_projet', 'don'=>'fk_projet',
-        		'actioncomm'=>'fk_project', 'mo'=>'fk_project'
+        		'actioncomm'=>'fk_project', 'mrp_mo'=>'fk_project'
         		);
         foreach ($listoftables as $key => $value)
         {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 613daa18ab0..3b91c867ebe 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -3,6 +3,7 @@
  * Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2014       Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2020       Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -154,7 +155,8 @@ class Task extends CommonObject
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."projet_task (";
-		$sql .= "fk_projet";
+		$sql .= "entity";
+		$sql .= ", fk_projet";
 		$sql .= ", ref";
 		$sql .= ", entity";
 		$sql .= ", fk_task_parent";
@@ -167,7 +169,8 @@ class Task extends CommonObject
 		$sql .= ", planned_workload";
 		$sql .= ", progress";
 		$sql .= ") VALUES (";
-		$sql .= $this->fk_project;
+		$sql .= $conf->entity;
+		$sql .= ", ".$this->fk_project;
 		$sql .= ", ".(!empty($this->ref) ? "'".$this->db->escape($this->ref)."'" : 'null');
 		$sql .= ", ".$conf->entity;
 		$sql .= ", ".$this->fk_task_parent;
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 1895270d758..0499629022d 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -51,7 +51,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php';  // Must be inclu
 if(! empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($object, 'fetchComments') && empty($object->comments)) $object->fetchComments();
 
 if ($id > 0 || ! empty($ref)) {
-    $upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->projet->dir_output . "/" . dol_sanitizeFileName($object->ref);
 }
 
 // Get parameters
@@ -94,11 +94,11 @@ if ($object->id > 0)
 {
 	$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
-    // To verify role of users
-    //$userAccess = $object->restrictedProjectArea($user,'read');
-    $userWrite  = $object->restrictedProjectArea($user, 'write');
-    //$userDelete = $object->restrictedProjectArea($user,'delete');
-    //print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
+	// To verify role of users
+	//$userAccess = $object->restrictedProjectArea($user,'read');
+	$userWrite  = $object->restrictedProjectArea($user, 'write');
+	//$userDelete = $object->restrictedProjectArea($user,'delete');
+	//print "userAccess=".$userAccess." userWrite=".$userWrite." userDelete=".$userDelete;
 
 	$head = project_prepare_head($object);
 	dol_fiche_head($head, 'document', $langs->trans("Project"), -1, ($object->public?'projectpub':'project'));
@@ -122,15 +122,15 @@ if ($object->id > 0)
 	// Thirdparty
 	if ($object->thirdparty->id > 0)
 	{
-	    $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
+		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'project');
 	}
 	$morehtmlref.='</div>';
 
 	// Define a complementary filter for search of next/prev ref.
 	if (! $user->rights->projet->all->lire)
 	{
-	    $objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
-	    $object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',', array_keys($objectsListId)):'0').")";
+		$objectsListId = $object->getProjectsAuthorizedForUser($user, 0, 0);
+		$object->next_prev_filter=" rowid in (".(count($objectsListId)?join(',', array_keys($objectsListId)):'0').")";
 	}
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
diff --git a/htdocs/projet/ganttchart.inc.php b/htdocs/projet/ganttchart.inc.php
index cd6b728ebbe..2411e3957d0 100644
--- a/htdocs/projet/ganttchart.inc.php
+++ b/htdocs/projet/ganttchart.inc.php
@@ -171,58 +171,58 @@ else
 function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $project_id = null)
 {
 	global $langs;
-    global $dateformatinput2;
+	global $dateformatinput2;
 
-    $start_date = $task["task_start_date"];
-    $end_date = $task["task_end_date"];
-    if (!$end_date) $end_date = $start_date;
-    $start_date = dol_print_date($start_date, $dateformatinput2);
-    $end_date = dol_print_date($end_date, $dateformatinput2);
-    // Resources
-    $resources = $task["task_resources"];
-    // Define depend (ex: "", "4,13", ...)
-    $depend = '';
-    $count = 0;
-    foreach ($task_dependencies as $value) {
-        // Not yet used project_dependencies = array(array(0=>idtask,1=>idtasktofinishfisrt))
-        if ($value[0] == $task['task_id']) {
-            $depend.=($count>0?",":"").$value[1];
-            $count ++;
-        }
-    }
-    // $depend .= "\"";
-    // Define parent
-    if ($project_id && $level < 0)
-    {
-    	$parent = '-'.$project_id;
-    }
-    else
-    {
-    	$parent = $task["task_parent_alternate_id"];
-    	//$parent = $task["task_parent"];
-    }
-    // Define percent
-    $percent = $task['task_percent_complete']?$task['task_percent_complete']:0;
-    // Link (more information)
-    if ($task["task_id"] < 0)
-    {
-    	//$link=DOL_URL_ROOT.'/projet/tasks.php?withproject=1&id='.abs($task["task_id"]);
-    	$link='';
-    }
-    else
-    {
-    	$link=DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
-    }
+	$start_date = $task["task_start_date"];
+	$end_date = $task["task_end_date"];
+	if (!$end_date) $end_date = $start_date;
+	$start_date = dol_print_date($start_date, $dateformatinput2);
+	$end_date = dol_print_date($end_date, $dateformatinput2);
+	// Resources
+	$resources = $task["task_resources"];
+	// Define depend (ex: "", "4,13", ...)
+	$depend = '';
+	$count = 0;
+	foreach ($task_dependencies as $value) {
+		// Not yet used project_dependencies = array(array(0=>idtask,1=>idtasktofinishfisrt))
+		if ($value[0] == $task['task_id']) {
+			$depend.=($count>0?",":"").$value[1];
+			$count ++;
+		}
+	}
+	// $depend .= "\"";
+	// Define parent
+	if ($project_id && $level < 0)
+	{
+		$parent = '-'.$project_id;
+	}
+	else
+	{
+		$parent = $task["task_parent_alternate_id"];
+		//$parent = $task["task_parent"];
+	}
+	// Define percent
+	$percent = $task['task_percent_complete']?$task['task_percent_complete']:0;
+	// Link (more information)
+	if ($task["task_id"] < 0)
+	{
+		//$link=DOL_URL_ROOT.'/projet/tasks.php?withproject=1&id='.abs($task["task_id"]);
+		$link='';
+	}
+	else
+	{
+		$link=DOL_URL_ROOT.'/projet/tasks/contact.php?withproject=1&id='.$task["task_id"];
+	}
 
-    // Name
-    //$name='<a href="'.DOL_URL_ROOT.'/projet/task/tasks.php?id='.$task['task_id'].'">'.$task['task_name'].'</a>';
-    $name=$task['task_name'];
+	// Name
+	//$name='<a href="'.DOL_URL_ROOT.'/projet/task/tasks.php?id='.$task['task_id'].'">'.$task['task_name'].'</a>';
+	$name=$task['task_name'];
 
-    /*for($i=0; $i < $level; $i++) {
+	/*for($i=0; $i < $level; $i++) {
         $name=' - '.$name;
     }*/
-    // Add line to gantt
-    /*
+	// Add line to gantt
+	/*
 	g.AddTaskItem(new JSGantt.TaskItem(1, 'Define Chart API','',          '',          'ggroupblack','', 0, 'Brian', 0,  1,0,1,'','','Some Notes text',g));
 	g.AddTaskItem(new JSGantt.TaskItem(11,'Chart Object',    '2014-02-20','2014-02-20','gmilestone', '', 1, 'Shlomy',100,0,1,1,'','','',g));
 	</pre>
@@ -247,30 +247,30 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
 	<dt>pGantt</dt><dd>(required) javascript JSGantt.GanttChart object from which to take settings.  Defaults to &quot;g&quot; for backwards compatibility</dd>
     */
 
-    //$note="";
+	//$note="";
 
-    $s = "\n// Add task level = ".$level." id=".$task["task_id"]." parent_id=".$task["task_parent"]." aternate_id=".$task["task_alternate_id"]." parent_aternate_id=".$task["task_parent_alternate_id"]."\n";
+	$s = "\n// Add task level = ".$level." id=".$task["task_id"]." parent_id=".$task["task_parent"]." aternate_id=".$task["task_alternate_id"]." parent_aternate_id=".$task["task_parent_alternate_id"]."\n";
 
-    //$task["task_is_group"]=1;		// When task_is_group is 1, content will be autocalculated from sum of all low tasks
+	//$task["task_is_group"]=1;		// When task_is_group is 1, content will be autocalculated from sum of all low tasks
 
-    // For JSGanttImproved
-    $css = $task['task_css'];
-    $line_is_auto_group = $task["task_is_group"];
-    //$line_is_auto_group=0;
-    //if ($line_is_auto_group) $css = 'ggroupblack';
-    //$dependency = ($depend?$depend:$parent."SS");
-    $dependency = '';
-    //$name = str_repeat("..", $level).$name;
+	// For JSGanttImproved
+	$css = $task['task_css'];
+	$line_is_auto_group = $task["task_is_group"];
+	//$line_is_auto_group=0;
+	//if ($line_is_auto_group) $css = 'ggroupblack';
+	//$dependency = ($depend?$depend:$parent."SS");
+	$dependency = '';
+	//$name = str_repeat("..", $level).$name;
 
-    $taskid = $task["task_alternate_id"];
-    //$taskid = $task['task_id'];
+	$taskid = $task["task_alternate_id"];
+	//$taskid = $task['task_id'];
 
-    $note = $task['note'];
+	$note = $task['note'];
 
-    $note = dol_concatdesc($note, $langs->trans("Workload").' : '.($task['task_planned_workload'] ? convertSecondToTime($task['task_planned_workload'], 'allhourmin') : ''));
+	$note = dol_concatdesc($note, $langs->trans("Workload").' : '.($task['task_planned_workload'] ? convertSecondToTime($task['task_planned_workload'], 'allhourmin') : ''));
 
-    $s.= "g.AddTaskItem(new JSGantt.TaskItem('".$taskid."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($note)."', g));";
-    echo $s;
+	$s.= "g.AddTaskItem(new JSGantt.TaskItem('".$taskid."', '".dol_escape_js(trim($name))."', '".$start_date."', '".$end_date."', '".$css."', '".$link."', ".$task['task_milestone'].", '".dol_escape_js($resources)."', ".($percent >= 0 ? $percent : 0).", ".$line_is_auto_group.", '".$parent."', 1, '".$dependency."', '".(empty($task["task_is_group"]) ? (($percent >= 0 && $percent != '') ? $percent.'%' : '') : '')."', '".dol_escape_js($note)."', g));";
+	echo $s;
 }
 
 /**
@@ -284,15 +284,15 @@ function constructGanttLine($tarr, $task, $task_dependencies, $level = 0, $proje
  */
 function findChildGanttLine($tarr, $parent, $task_dependencies, $level)
 {
-    $n=count($tarr);
+	$n=count($tarr);
 
-    $old_parent_id = 0;
-    for ($x=0; $x < $n; $x++)
-    {
-        if($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"])
-        {
-        	// Create a grouping parent task for the new level
-        	/*if (empty($old_parent_id) || $old_parent_id != $tarr[$x]['task_project_id'])
+	$old_parent_id = 0;
+	for ($x=0; $x < $n; $x++)
+	{
+		if($tarr[$x]["task_parent"] == $parent && $tarr[$x]["task_parent"] != $tarr[$x]["task_id"])
+		{
+			// Create a grouping parent task for the new level
+			/*if (empty($old_parent_id) || $old_parent_id != $tarr[$x]['task_project_id'])
 			{
 				$tmpt = array(
 	        	'task_id'=> -98, 'task_name'=>'Level '.$level, 'task_resources'=>'', 'task_start_date'=>'', 'task_end_date'=>'',
@@ -301,9 +301,9 @@ function findChildGanttLine($tarr, $parent, $task_dependencies, $level)
         		$old_parent_id = $tarr[$x]['task_project_id'];
 			}*/
 
-            constructGanttLine($tarr, $tarr[$x], $task_dependencies, $level, null);
-            findChildGanttLine($tarr, $tarr[$x]["task_id"], $task_dependencies, $level+1);
-        }
-    }
+			constructGanttLine($tarr, $tarr[$x], $task_dependencies, $level, null);
+			findChildGanttLine($tarr, $tarr[$x]["task_id"], $task_dependencies, $level+1);
+		}
+	}
 }
 
diff --git a/htdocs/projet/graph_opportunities.inc.php b/htdocs/projet/graph_opportunities.inc.php
index e535756ce0c..2dc4c90338b 100644
--- a/htdocs/projet/graph_opportunities.inc.php
+++ b/htdocs/projet/graph_opportunities.inc.php
@@ -29,19 +29,15 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
 	        $obj = $db->fetch_object($resql);
 	        if ($obj)
 	        {
-	            //if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-	            {
-	                $valsnb[$obj->opp_status] = $obj->nb;
-	                $valsamount[$obj->opp_status] = $obj->opp_amount;
-	                $totalnb += $obj->nb;
-	                if ($obj->opp_status) $totaloppnb += $obj->nb;
-				if (!in_array($obj->code, array('WON', 'LOST')))
-	                {
+                $valsnb[$obj->opp_status] = $obj->nb;
+                $valsamount[$obj->opp_status] = $obj->opp_amount;
+                $totalnb += $obj->nb;
+                if ($obj->opp_status) $totaloppnb += $obj->nb;
+				if (!in_array($obj->code, array('WON', 'LOST'))) {
 					$totalamount += $obj->opp_amount;
 					$ponderated_opp_amount += $obj->ponderated_opp_amount;
 				}
-	            }
-	            $total += $row[0];
+	            $total += $obj->nb;
 	        }
 	        $i++;
 	    }
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index ddb66bc3317..e590e4ad82b 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -88,17 +88,15 @@ $morehtml.='</SELECT>';
 $morehtml.='<input type="submit" class="button" name="refresh" value="'.$langs->trans("Refresh").'">';
 $morehtml.='</form>';
 
-print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'project', 0, $morehtml);
-
-// Show description of content
-print '<div class="opacitymedium">';
-if ($mine) print $langs->trans("MyProjectsDesc").'<br><br>';
+if ($mine) $tooltiphelp = $langs->trans("MyProjectsDesc");
 else
 {
-	if (!empty($user->rights->projet->all->lire) && !$socid) print $langs->trans("ProjectsDesc").'<br><br>';
-	else print $langs->trans("ProjectsPublicDesc").'<br><br>';
+	if (!empty($user->rights->projet->all->lire) && !$socid) $tooltiphelp = $langs->trans("ProjectsDesc");
+	else $tooltiphelp = $langs->trans("ProjectsPublicDesc");
 }
-print '</div>';
+
+print_barre_liste($form->textwithpicto($title, $tooltiphelp), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, -1, 'project', 0, $morehtml);
+
 
 // Get list of ponderated percent for each status
 $listofoppstatus = array(); $listofopplabel = array(); $listofoppcode = array();
diff --git a/htdocs/public/agenda/agendaexport.php b/htdocs/public/agenda/agendaexport.php
index a94b0659950..e20bff22e5a 100644
--- a/htdocs/public/agenda/agendaexport.php
+++ b/htdocs/public/agenda/agendaexport.php
@@ -46,7 +46,7 @@ if (! defined('NOIPCHECK'))		 define('NOIPCHECK', '1');  // Do not check IP defi
  */
 function llxHeaderVierge()
 {
-    print '<html><title>Export agenda cal</title><body>';
+	print '<html><title>Export agenda cal</title><body>';
 }
 /**
  * Footer function
@@ -55,7 +55,7 @@ function llxHeaderVierge()
  */
 function llxFooterVierge()
 {
-    print '</body></html>';
+	print '</body></html>';
 }
 
 require '../../main.inc.php';
@@ -129,12 +129,12 @@ $filename=$shortfilename;
 // Complete long filename
 foreach ($filters as $key => $value)
 {
-    //if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
+	//if ($key == 'notolderthan')    $filename.='-notolderthan'.$value; This filter key is already added before and does not need to be in filename
 	if ($key == 'year')            $filename.='-year'.$value;
-    if ($key == 'id')              $filename.='-id'.$value;
-    if ($key == 'idfrom')          $filename.='-idfrom'.$value;
-    if ($key == 'idto')            $filename.='-idto'.$value;
-    if ($key == 'project')         $filename.='-project'.$value;
+	if ($key == 'id')              $filename.='-id'.$value;
+	if ($key == 'idfrom')          $filename.='-idfrom'.$value;
+	if ($key == 'idto')            $filename.='-idto'.$value;
+	if ($key == 'project')         $filename.='-project'.$value;
 	if ($key == 'logina')	       $filename.='-logina'.$value;	// Author
 	if ($key == 'logint')	       $filename.='-logint'.$value;	// Assigned to
 	if ($key == 'notactiontype')   $filename.='-notactiontype'.$value;
@@ -149,7 +149,7 @@ if ($shortfilename=='dolibarrcalendar')
 	$langs->load("main");
 	$langs->load("errors");
 	llxHeaderVierge();
-    print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX", 'format').'</div>';
+	print '<div class="error">'.$langs->trans("ErrorWrongValueForParameterX", 'format').'</div>';
 	llxFooterVierge();
 	exit;
 }
@@ -186,7 +186,7 @@ if ($format == 'ical' || $format == 'vcal')
 		$result=readfile($outputfile);
 		if (! $result) print 'File '.$outputfile.' was empty.';
 
-	    //header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
+		//header("Location: ".DOL_URL_ROOT.'/document.php?modulepart=agenda&file='.urlencode($filename));
 		exit;
 	}
 	else
diff --git a/htdocs/public/emailing/mailing-read.php b/htdocs/public/emailing/mailing-read.php
index 7b9726bcfc5..e7a0266e339 100644
--- a/htdocs/public/emailing/mailing-read.php
+++ b/htdocs/public/emailing/mailing-read.php
@@ -81,7 +81,7 @@ if (! empty($tag))
 
 	$resql=$db->query($sql);
 
-    //Update status communication of contact prospect
+	//Update status communication of contact prospect
 	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=3 WHERE fk_stcomm != -1 AND rowid IN (SELECT sc.fk_soc FROM ".MAIN_DB_PREFIX."socpeople AS sc INNER JOIN ".MAIN_DB_PREFIX."mailing_cibles AS mc ON mc.tag = '".$db->escape($tag)."' AND mc.source_type = 'contact' AND mc.source_id = sc.rowid)";
 	dol_syslog("public/emailing/mailing-read.php : Mail read contact : ".$sql, LOG_DEBUG);
 
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index 32a83e5c432..195a7560631 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -152,7 +152,7 @@ function llxHeaderVierge($title, $head = "")
 */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
 	print "</body>\n";
 	print "</html>\n";
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 1dfe694f154..0514c5ad565 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -56,10 +56,10 @@ function llxHeaderVierge($title, $head = "")
 
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 	print "<html>\n";
-    print "<head>\n";
-    print "<title>".$title."</title>\n";
-    if ($head) print $head."\n";
-    print "</head>\n";
+	print "<head>\n";
+	print "<title>".$title."</title>\n";
+	if ($head) print $head."\n";
+	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
 
@@ -70,9 +70,9 @@ function llxHeaderVierge($title, $head = "")
  */
 function llxFooterVierge()
 {
-    printCommonFooter('public');
+	printCommonFooter('public');
 
-    print "</body>\n";
+	print "</body>\n";
 	print "</html>\n";
 }
 
diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php
index 43344c376aa..090f2e81358 100644
--- a/htdocs/public/notice.php
+++ b/htdocs/public/notice.php
@@ -36,14 +36,14 @@ require '../main.inc.php';
 
 if (! GETPOST('transkey', 'alphanohtml') && ! GETPOST('transphrase', 'alphanohtml'))
 {
-    print 'Sorry, it seems your internet connexion is off.<br>';
-    print 'You need to be connected to network to use this software.<br>';
+	print 'Sorry, it seems your internet connexion is off.<br>';
+	print 'You need to be connected to network to use this software.<br>';
 }
 else
 {
-    $langs->load("error");
-    $langs->load("other");
+	$langs->load("error");
+	$langs->load("other");
 
-    if (GETPOST('transphrase', 'alphanohtml')) print GETPOST('transphrase', 'alphanohtml');
-    if (GETPOST('transkey', 'alphanohtml')) print $langs->trans(GETPOST('transkey', 'alphanohtml'));
+	if (GETPOST('transphrase', 'alphanohtml')) print GETPOST('transphrase', 'alphanohtml');
+	if (GETPOST('transkey', 'alphanohtml')) print $langs->trans(GETPOST('transkey', 'alphanohtml'));
 }
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index c9697e2e1e4..ef5458456c5 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -255,13 +255,13 @@ llxHeaderSurvey($object->titre, "", 0, 0, $arrayofjs, $arrayofcss, $numsondage);
 
 if (empty($object->ref))     // For survey, id is a hex string
 {
-    $langs->load("errors");
-    print $langs->trans("ErrorRecordNotFound");
+	$langs->load("errors");
+	print $langs->trans("ErrorRecordNotFound");
 
-    llxFooterSurvey();
+	llxFooterSurvey();
 
-    $db->close();
-    exit();
+	$db->close();
+	exit();
 }
 
 // Define format of choices
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index c0ce22d69ed..3da50335e55 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -48,9 +48,9 @@ if (empty($usedolheader))
 }
 else
 {
-    $arraycss=array();
-    $arrayjs=array();
-    /*
+	$arraycss=array();
+	$arrayjs=array();
+	/*
 	$arraycss=array('/includes/jquery/plugins/datatables/media/css/jquery.dataTables.css',
 			'/includes/jquery/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css',
 			'/includes/jquery/plugins/datatables/extensions/ColReorder/css/colReorder.dataTables.min.css'
@@ -207,12 +207,12 @@ $moreforfilter.='</div>';
 
 if (! empty($moreforfilter))
 {
-    print '<div class="liste_titre liste_titre_bydiv centpercent">';
-    print $moreforfilter;
-    $parameters=array();
-    $reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook
-    print $hookmanager->resPrint;
-    print '</div>';
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	$parameters=array();
+	$reshook=$hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	print '</div>';
 }
 
 ?>
@@ -245,12 +245,12 @@ if (! empty($moreforfilter))
 $(document).ready(function(){
     $('#idtableexample2').dataTable( {
     	<?php
-    	if ($optioncss=='print') {
-    	 	print '\'dom\': \'lfrtip\',';
-    	} else {
-    		print '\'dom\': \'Blfrtip\',';
-    	}
-    	?>
+		if ($optioncss=='print') {
+		 	print '\'dom\': \'lfrtip\',';
+		} else {
+			print '\'dom\': \'Blfrtip\',';
+		}
+		?>
     	"colReorder": true,
 		'buttons': [
 		          'colvis','copy', 'csv', 'excel', 'pdf', 'print'
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index b624a847dc5..3b37a164fc8 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -158,16 +158,16 @@ global $dolibarr_main_data_root;
 
 if ($pageid == 'css')   // No more used ?
 {
-    header('Content-type: text/css');
-    // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
-    //if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
-    //else
-    header('Cache-Control: no-cache');
-    $original_file=$dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
+	header('Content-type: text/css');
+	// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
+	//if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
+	//else
+	header('Cache-Control: no-cache');
+	$original_file=$dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
 }
 else
 {
-    $original_file=$dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
+	$original_file=$dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
 }
 
 // Find the subdirectory name as the reference
@@ -177,7 +177,7 @@ $refname=basename(dirname($original_file)."/");
 // Limite acces si droits non corrects
 if (! $accessallowed)
 {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Security:
@@ -185,10 +185,10 @@ if (! $accessallowed)
 // les noms de fichiers.
 if (preg_match('/\.\./', $original_file) || preg_match('/[<>|]/', $original_file))
 {
-    dol_syslog("Refused to deliver file ".$original_file);
-    $file=basename($original_file);		// Do no show plain path of original_file in shown error message
-    dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file));
-    exit;
+	dol_syslog("Refused to deliver file ".$original_file);
+	$file=basename($original_file);		// Do no show plain path of original_file in shown error message
+	dol_print_error(0, $langs->trans("ErrorFileNameInvalid", $file));
+	exit;
 }
 
 clearstatcache();
@@ -202,14 +202,14 @@ $original_file_osencoded=dol_osencode($original_file);	// New file name encoded
 // This test if file exists should be useless. We keep it to find bug more easily
 if (! file_exists($original_file_osencoded))
 {
-    // Return header 404
-    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found", true, 404);
+	// Return header 404
+	header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found", true, 404);
 
-    $langs->load("website");
-    print $langs->trans("RequestedPageHasNoContentYet", $pageid);
+	$langs->load("website");
+	print $langs->trans("RequestedPageHasNoContentYet", $pageid);
 
-    include DOL_DOCUMENT_ROOT.'/public/error-404.php';
-    exit;
+	include DOL_DOCUMENT_ROOT.'/public/error-404.php';
+	exit;
 }
 
 
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index b2723a0ce6a..c67dc9a3aeb 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1175,8 +1175,9 @@ if ($action == 'create')
 					$extrafields->fetch_name_optionals_label($srcLine->table_element);
 					$extrafields->fetch_name_optionals_label($line->table_element);
 
-					$srcLine->fetch_optionals($line->id); // fetch extrafields also available in orderline
-					$line->fetch_optionals($object->id);
+					$srcLine->id = $line->id;
+					$srcLine->fetch_optionals(); // fetch extrafields also available in orderline
+					$line->fetch_optionals();
 
 					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
 
@@ -1231,7 +1232,7 @@ elseif ($id || $ref)
 		$soc = new Societe($db);
 		$soc->fetch($object->socid);
 
-		$res = $object->fetch_optionals($object->id);
+		$res = $object->fetch_optionals();
 
 		$head = reception_prepare_head($object);
 		dol_fiche_head($head, 'reception', $langs->trans("Reception"), -1, 'reception');
@@ -1610,7 +1611,7 @@ elseif ($id || $ref)
 		if ($action == 'editline')
 		{
 			print '<form name="updateline" id="updateline" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;lineid='.$line_id.'" 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="id" value="' . $object->id.'">';
@@ -1986,7 +1987,8 @@ elseif ($id || $ref)
 			{
 				$colspan = empty($conf->productbatch->enabled) ? 8 : 9;
 				$line = new CommandeFournisseurDispatch($db);
-				$line->fetch_optionals($lines[$i]->id);
+				$line->id = $lines[$i]->id;
+				$line->fetch_optionals();
 
 				if ($action == 'editline' && $lines[$i]->id == $line_id)
 				{
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 0381892d9e3..2814b7e1d11 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -477,7 +477,7 @@ class Reception extends CommonObject
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 				$extrafields = new ExtraFields($this->db);
 				$extrafields->fetch_name_optionals_label($this->table_element, true);
-				$this->fetch_optionals($this->id);
+				$this->fetch_optionals();
 
 				/*
 				 * Lines
diff --git a/htdocs/reception/index.php b/htdocs/reception/index.php
index a9ed8667474..b10c2ffe295 100644
--- a/htdocs/reception/index.php
+++ b/htdocs/reception/index.php
@@ -34,8 +34,7 @@ $hookmanager = new HookManager($db);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('receptionindex'));
 
-$langs->load("orders");
-$langs->load("receptions");
+$langs->loadLangs(array("orders", "receptions"));
 
 /*
  *	View
@@ -66,9 +65,11 @@ if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is usele
     print "</table></div></form><br>\n";
 }
 
+
 /*
- * Receptions to validate
+ * Draft receptions
  */
+
 $clause = " WHERE ";
 
 $sql = "SELECT e.rowid, e.ref, e.ref_supplier,";
@@ -91,13 +92,14 @@ if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 $resql=$db->query($sql);
 if ($resql)
 {
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<th colspan="3">'.$langs->trans("ReceptionsToValidate").'</th></tr>';
+
 	$num = $db->num_rows($resql);
 	if ($num)
 	{
-        print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre">';
-		print '<th colspan="3">'.$langs->trans("ReceptionsToValidate").'</th></tr>';
 		$i = 0;
 		while ($i < $num)
 		{
@@ -118,132 +120,24 @@ if ($resql)
 			print '</td></tr>';
 			$i++;
 		}
-		print "</table></div><br>";
 	}
-}
-
-
-/*
- * CommandeFournisseurs a traiter
- */
-$sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$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.fk_statut = 3";//Commandé
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-$sql.= " ORDER BY c.rowid ASC";
-$resql=$db->query($sql);
-if ($resql)
-{
-	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		$langs->load("orders");
-
-		$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("SuppliersOrdersToProcess").'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-			$orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_supplier=$obj->ref_supplier;
-			$orderstatic->statut=$obj->fk_statut;
-			$orderstatic->facturee=0;
-
-			$companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-
-			print '<tr class="oddeven">';
-			print '<td class="nowrap">';
-			print $orderstatic->getNomUrl(1);
-			print '</td>';
-			print '<td>';
-			print $companystatic->getNomUrl(1, 'customer', 32);
-			print '</td>';
-			print '<td class="right">';
-			print $orderstatic->getLibStatut(3);
-			print '</td>';
-			print '</tr>';
-			$i++;
-		}
-		print "</table></div><br>";
+	else {
+		print '<tr><td><span class="opacitymedium">'.$langs->trans("None").'</span></td><td></td><td></td></tr>';
 	}
+
+	print "</table></div><br>";
 }
 
 
 //print '</td><td valign="top" width="70%">';
 print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
 
+$max = 5;
 
 /*
- * CommandeFournisseurs en traitement
+ * Latest receptions
  */
-$sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid";
-$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
-$sql.= " ".MAIN_DB_PREFIX."societe as s";
-if (!$user->rights->societe->client->voir && !$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.fk_statut IN (4)";
-if ($socid) $sql.= " AND c.fk_soc = ".$socid;
-if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
 
-$resql = $db->query($sql);
-if ( $resql )
-{
-	$langs->load("orders");
-
-	$num = $db->num_rows($resql);
-	if ($num)
-	{
-		$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("SuppliersOrdersInProcess").'</th></tr>';
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
-
-		    $orderstatic->id=$obj->rowid;
-			$orderstatic->ref=$obj->ref;
-			$orderstatic->ref_supplier=$obj->ref_supplier;
-			$orderstatic->statut=$obj->status;
-            $orderstatic->facturee=$obj->billed;
-
-            $companystatic->name=$obj->name;
-			$companystatic->id=$obj->socid;
-
-			print '<tr class="oddeven"><td>';
-			print $orderstatic->getNomUrl(1);
-			print '</td>';
-			print '<td>';
-			print $companystatic->getNomUrl(1, 'customer');
-			print '</td>';
-            print '<td class="right">';
-            print $orderstatic->getLibStatut(3);
-            print '</td>';
-            print '</tr>';
-			$i++;
-		}
-		print "</table></div><br>";
-	}
-}
-else dol_print_error($db);
-
-
-/*
- * Last receptions
- */
 $sql = "SELECT e.rowid, e.ref, e.ref_supplier,";
 $sql.= " s.nom as name, s.rowid as socid,";
 $sql.= " c.ref as commande_fournisseur_ref, c.rowid as commande_fournisseur_id";
@@ -257,8 +151,7 @@ if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND sc.fk_user
 $sql.= " AND e.fk_statut = 1";
 if ($socid) $sql.= " AND c.fk_soc = ".$socid;
 $sql.= " ORDER BY e.date_delivery DESC";
-
-$sql.= $db->plimit(5, 0);
+$sql.= $db->plimit($max, 0);
 
 $resql = $db->query($sql);
 if ($resql)
@@ -267,7 +160,7 @@ if ($resql)
 	if ($num)
 	{
 		$i = 0;
-        print '<div class="div-table-responsive-no-min">';
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="3">'.$langs->trans("LastReceptions", $num).'</th></tr>';
@@ -301,6 +194,64 @@ if ($resql)
 else dol_print_error($db);
 
 
+
+/*
+ * Open pruchase orders to process
+ */
+
+$sql = "SELECT c.rowid, c.ref, c.ref_supplier as ref_supplier, c.fk_statut as status, c.billed as billed, s.nom as name, s.rowid as socid";
+$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c,";
+$sql.= " ".MAIN_DB_PREFIX."societe as s";
+if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+$sql.= " WHERE c.fk_soc = s.rowid";
+$sql.= " AND c.entity IN (".getEntity('supplier_order').")";
+$sql.= " AND c.fk_statut IN (".CommandeFournisseur::STATUS_ORDERSENT.", ".CommandeFournisseur::STATUS_RECEIVED_PARTIALLY.")";
+if ($socid > 0) $sql.= " AND c.fk_soc = ".$socid;
+if (!$user->rights->societe->client->voir && !$socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+$sql.= " ORDER BY c.rowid ASC";
+$resql=$db->query($sql);
+if ($resql)
+{
+	$num = $db->num_rows($resql);
+	if ($num)
+	{
+		$langs->load("orders");
+
+		$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("SuppliersOrdersToProcess").' <span class="badge">'.$num.'</span></th></tr>';
+		while ($i < $num)
+		{
+			$obj = $db->fetch_object($resql);
+
+			$orderstatic->id=$obj->rowid;
+			$orderstatic->ref=$obj->ref;
+			$orderstatic->ref_supplier=$obj->ref_supplier;
+			$orderstatic->statut=$obj->status;
+			$orderstatic->facturee=$obj->billed;
+
+			$companystatic->name=$obj->name;
+			$companystatic->id=$obj->socid;
+
+			print '<tr class="oddeven">';
+			print '<td class="nowrap">';
+			print $orderstatic->getNomUrl(1);
+			print '</td>';
+			print '<td>';
+			print $companystatic->getNomUrl(1, 'customer', 32);
+			print '</td>';
+			print '<td class="right">';
+			print $orderstatic->getLibStatut(3);
+			print '</td>';
+			print '</tr>';
+			$i++;
+		}
+		print "</table></div><br>";
+	}
+}
+
 print '</div></div></div>';
 
 $parameters = array('user' => $user);
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index de558a6bee4..7b2ce169d33 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 
-$langs->loadLangs(array("sendings", "receptions", "deliveries", 'companies', 'bills'));
+$langs->loadLangs(array("sendings", "receptions", "deliveries", 'companies', 'bills', 'orders'));
 
 $socid = GETPOST('socid', 'int');
 $massaction = GETPOST('massaction', 'alpha');
@@ -172,7 +172,7 @@ if (empty($reshook))
     		$rcp = new Reception($db);
 			 // On ne facture que les réceptions validées
     		if ($rcp->fetch($id_reception) <= 0 || $rcp->statut != 1) {
-				$errors[] = $langs->trans('StatusMustBeValidate', $rcp->ref);
+				$errors[] = $langs->trans('StatusOfRefMustBe', $rcp->ref, $langs->transnoentities("StatusSupplierOrderValidatedShort"));
 				$error++;
 				continue;
 			}
@@ -184,12 +184,12 @@ if (empty($reshook))
 				if (!empty($object->rowid))$object->fetchObjectLinked();
 				$rcp->fetchObjectLinked();
 
-				if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
+				if (count($rcp->linkedObjectsIds['reception']) > 0)
 				{
-					foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
+					foreach ($rcp->linkedObjectsIds['reception'] as $key => $value)
 					{
-						if (empty($object->linkedObjectsIds['order_supplier']) || !in_array($value, $object->linkedObjectsIds['order_supplier']))//Dont try to link if already linked
-							$object->add_object_linked('order_supplier', $value); // add supplier order linked object
+						if (empty($object->linkedObjectsIds['reception']) || !in_array($value, $object->linkedObjectsIds['reception']))//Dont try to link if already linked
+							$object->add_object_linked('reception', $value); // add supplier order linked object
 					}
 				}
 			}
@@ -216,11 +216,11 @@ if (empty($reshook))
     			$object->origin_id = $id_reception;
 
 				$rcp->fetchObjectLinked();
-				if (count($rcp->linkedObjectsIds['order_supplier']) > 0)
+				if (count($rcp->linkedObjectsIds['reception']) > 0)
 				{
-					foreach ($rcp->linkedObjectsIds['order_supplier'] as $key => $value)
+					foreach ($rcp->linkedObjectsIds['reception'] as $key => $value)
 					{
-						$object->linked_objects['order_supplier'] = $value;
+						$object->linked_objects['reception'] = $value;
 					}
 				}
 
diff --git a/htdocs/reception/stats/index.php b/htdocs/reception/stats/index.php
index f36c8cf4a86..251247a252b 100644
--- a/htdocs/reception/stats/index.php
+++ b/htdocs/reception/stats/index.php
@@ -341,7 +341,7 @@ print '</table>';
 */
 
 print '<br>';
-print '<i>'.$langs->trans("StatsOnReceptionsOnlyValidated").'</i>';
+print '<i class="opacitymedium">'.$langs->trans("StatsOnReceptionsOnlyValidated").'</i>';
 
 llxFooter();
 
diff --git a/htdocs/resource/contact.php b/htdocs/resource/contact.php
index 3e2a004e194..f57b810394a 100644
--- a/htdocs/resource/contact.php
+++ b/htdocs/resource/contact.php
@@ -52,11 +52,11 @@ $result = $object->fetch($id, $ref);
 
 if ($action == 'addcontact' && $user->rights->resource->write)
 {
-    if ($result > 0 && $id > 0)
-    {
-    	$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+	if ($result > 0 && $id > 0)
+	{
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
   		$result = $object->add_contact($contactid, GETPOST('type', 'int'), GETPOST('source', 'alpha'));
-    }
+	}
 
 	if ($result >= 0)
 	{
@@ -79,7 +79,7 @@ if ($action == 'addcontact' && $user->rights->resource->write)
 // Toggle the status of a contact
 elseif ($action == 'swapstatut' && $user->rights->resource->write)
 {
-    $result=$object->swapContactStatus(GETPOST('ligne', 'int'));
+	$result=$object->swapContactStatus(GETPOST('ligne', 'int'));
 }
 
 // Erase a contact
diff --git a/htdocs/salaries/class/salariesstats.class.php b/htdocs/salaries/class/salariesstats.class.php
index 41449cca0cd..37e950b1bbe 100644
--- a/htdocs/salaries/class/salariesstats.class.php
+++ b/htdocs/salaries/class/salariesstats.class.php
@@ -126,6 +126,7 @@ class SalariesStats extends Stats
 
         $res=$this->_getAmountByMonth($year, $sql, $format);
         //var_dump($res);print '<br>';
+
         return $res;
     }
 
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 0b6375a1f64..86f40ee7a6c 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -79,9 +79,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>";
 }
 
 
@@ -96,7 +96,7 @@ 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';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -106,10 +106,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print "<br>";
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print "<br>";
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index 694479ebd0e..11a56314b02 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -79,9 +79,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>";
 }
 
 
@@ -93,10 +93,10 @@ if ($action != 'create' && $action != 'edit')
 
 if ($action == 'create')
 {
-    print '<br><div id="newattrib"></div>';
-    print load_fiche_titre($langs->trans('NewAttribute'));
+	print '<br><div id="newattrib"></div>';
+	print load_fiche_titre($langs->trans('NewAttribute'));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -106,10 +106,10 @@ if ($action == 'create')
 /* ************************************************************************** */
 if ($action == 'edit' && ! empty($attrname))
 {
-    print '<br><div id="editattrib"></div>';
-    print load_fiche_titre($langs->trans("FieldEdition", $attrname));
+	print '<br><div id="editattrib"></div>';
+	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
 
-    require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index edc00088c39..dc6b9db0eac 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -98,6 +98,13 @@ if (!empty($canvas))
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas);
 
+$permissiontoread = $user->rights->societe->lire;
+$permissiontoadd = $user->rights->societe->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->societe->delete || ($permissiontoadd && isset($object->status) && $object->status == 0);
+$permissionnote = $user->rights->societe->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->societe->creer; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->entity : 1];
+
 
 /*
  * Actions
@@ -1186,7 +1193,7 @@ else
         print '<table class="border centpercent">';
 
         // Name, firstname
-	    print '<tr><td class="titlefieldcreate">';
+	    print '<tr class="tr-field-thirdparty-name"><td class="titlefieldcreate tdtop">';
         if ($object->particulier || $private)
         {
 	        print '<span id="TypeName" class="fieldrequired">'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName', 'name').'</span>';
@@ -1196,7 +1203,9 @@ else
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
         }
 	    print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
-	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus"></td>';
+	    print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.$object->name.'" autofocus="autofocus">';
+	    print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
+	    print '</td>';
 	    if (!empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
 	    {
 		    print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.$object->prefix_comm.'"></td>';
@@ -1286,24 +1295,30 @@ else
         // Barcode
         if (!empty($conf->barcode->enabled))
         {
-            print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
+        	print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
 	        print '<td colspan="3"><input type="text" name="barcode" id="barcode" value="'.$object->barcode.'">';
             print '</td></tr>';
         }
 
         // Address
-        print '<tr><td class="tdtop">'.$form->editfieldkey('Address', 'address', '', $object, 0).'</td>';
-	    print '<td colspan="3"><textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft">';
+        print '<tr><td class="tdtop">';
+        print $form->editfieldkey('Address', 'address', '', $object, 0);
+        print '</td>';
+	    print '<td colspan="3">';
+	    print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_2.'" wrap="soft">';
         print $object->address;
-        print '</textarea></td></tr>';
+        print '</textarea>';
+        print $form->widgetForTranslation("address", $object, $permissiontoadd, 'textarea', 'alphanohtml', 'quatrevingtpercent');
+        print '</td></tr>';
 
         // Zip / Town
         print '<tr><td>'.$form->editfieldkey('Zip', 'zipcode', '', $object, 0).'</td><td>';
         print $formcompany->select_ziptown($object->zip, 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
         print '</td>';
         if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td>'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
+        print '<td class="tdtop">'.$form->editfieldkey('Town', 'town', '', $object, 0).'</td><td>';
         print $formcompany->select_ziptown($object->town, 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 0, '', 'maxwidth100 quatrevingtpercent');
+        print $form->widgetForTranslation("town", $object, $permissiontoadd, 'string', 'alphanohtml', 'maxwidth100 quatrevingtpercent');
         print '</td></tr>';
 
         // Country
@@ -1330,17 +1345,17 @@ else
         }
 
         // Phone / Fax
-        print '<tr><td>'.img_picto('', 'object_phoning').' '.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
-        print '<td><input type="text" name="phone" id="phone" class="maxwidth200" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+        print '<tr><td>'.$form->editfieldkey('Phone', 'phone', '', $object, 0).'</td>';
+        print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
         if ($conf->browser->layout == 'phone') print '</tr><tr>';
-        print '<td>'.img_picto('', 'object_phoning_fax').' '.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
-        print '<td><input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+        print '<td>'.$form->editfieldkey('Fax', 'fax', '', $object, 0).'</td>';
+        print '<td>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
 
         // Email / Web
-        print '<tr><td>'.img_picto('', 'object_email').' '.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
-	    print '<td colspan="3"><input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
-        print '<tr><td>'.img_picto('', 'globe').' '.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
-	    print '<td colspan="3"><input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
+        print '<tr><td>'.$form->editfieldkey('EMail', 'email', '', $object, 0, 'string', '', $conf->global->SOCIETE_EMAIL_MANDATORY).'</td>';
+	    print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" value="'.$object->email.'"></td></tr>';
+        print '<tr><td>'.$form->editfieldkey('Web', 'url', '', $object, 0).'</td>';
+	    print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" value="'.$object->url.'"></td></tr>';
 
         if (!empty($conf->socialnetworks->enabled)) {
             foreach ($socialnetworks as $key => $value) {
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index ad5c66a50b8..e6e9e42aa75 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -712,6 +712,7 @@ class Societe extends CommonObject
      */
 	public $multicurrency_code;
 
+
 	/**
 	 *    Constructor
 	 *
@@ -1986,11 +1987,11 @@ class Societe extends CommonObject
 	 *    	@param	float	$remise     	Amount of discount
 	 *    	@param  User	$user       	User adding discount
 	 *    	@param  string	$desc			Reason of discount
-	 *      @param  float	$tva_tx     	VAT rate
+	 *      @param  string	$vatrate     	VAT rate (may contain the vat code too). Exemple: '1.23', '1.23 (ABC)', ...
 	 *      @param	int		$discount_type	0 => customer discount, 1 => supplier discount
-	 *		@return	int					<0 if KO, id of discount record if OK
+	 *		@return	int						<0 if KO, id of discount record if OK
 	 */
-    public function set_remise_except($remise, User $user, $desc, $tva_tx = 0, $discount_type = 0)
+    public function set_remise_except($remise, User $user, $desc, $vatrate = '', $discount_type = 0)
 	{
         // phpcs:enable
 		global $langs;
@@ -2011,8 +2012,17 @@ class Societe extends CommonObject
 			return -2;
 		}
 
-		if ($this->id)
+		if ($this->id > 0)
 		{
+			// Clean vat code
+			$reg = array();
+			$vat_src_code = '';
+			if (preg_match('/\((.*)\)/', $vatrate, $reg))
+			{
+				$vat_src_code = $reg[1];
+				$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
+			}
+
 			require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
 			$discount = new DiscountAbsolute($this->db);
@@ -2021,10 +2031,12 @@ class Societe extends CommonObject
 			$discount->discount_type = $discount_type;
 
 			$discount->amount_ht = $discount->multicurrency_amount_ht = price2num($remise, 'MT');
-			$discount->amount_tva = $discount->multicurrency_amount_tva = price2num($remise * $tva_tx / 100, 'MT');
+			$discount->amount_tva = $discount->multicurrency_amount_tva = price2num($remise * $vatrate / 100, 'MT');
 			$discount->amount_ttc = $discount->multicurrency_amount_ttc = price2num($discount->amount_ht + $discount->amount_tva, 'MT');
 
-			$discount->tva_tx = price2num($tva_tx, 'MT');
+			$discount->tva_tx = price2num($vatrate, 'MT');
+			$discount->vat_src_code = $vat_src_code;
+
 			$discount->description = $desc;
 
 			$result = $discount->create($user);
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index c961b04d8ce..2b362268c4b 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -141,7 +141,7 @@ llxHeader('', $title, $help_url);
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
 
-if (!empty($object->id)) $res = $object->fetch_optionals($object->id, null);
+if (!empty($object->id)) $res = $object->fetch_optionals();
 //if ($res < 0) { dol_print_error($db); exit; }
 
 
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 04ad577bff9..fa8ac3d9469 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -102,6 +102,7 @@ $search_parent_name = GETPOST('search_parent_name', 'alpha');
 $type = GETPOST('type', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 $mode = GETPOST("mode", 'alpha');
+$place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0';	// $place is string id of table for Bar or Restaurant
 
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
 
@@ -228,7 +229,6 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if ($action == "change")	// Change customer for TakePOS
 {
     $idcustomer = GETPOST('idcustomer', 'int');
-    $place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Ba or Restaurant
 
     // Check if draft invoice already exists, if not create it
 	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' AND entity IN (".getEntity('invoice').")";
@@ -252,8 +252,8 @@ if ($action == "change")	// Change customer for TakePOS
     $resql = $db->query($sql);
     ?>
 	    <script>
-	    console.log("Reload page invoice.php");
-	    parent.$("#poslines").load("invoice.php?place="+<?php print $place; ?>, function() {
+	    console.log("Reload page invoice.php with place=<?php print $place; ?>");
+	    parent.$("#poslines").load("invoice.php?place=<?php print $place; ?>", function() {
 	        //parent.$("#poslines").scrollTop(parent.$("#poslines")[0].scrollHeight);
 			<?php if (!$resql) { ?>
 				alert('Error failed to update customer on draft invoice.');
@@ -1031,8 +1031,7 @@ while ($i < min($num, $limit))
 	print '<tr class="oddeven"';
 	if ($contextpage == 'poslist')
 	{
-		$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Bar or Restaurant
-	    print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.$place.'\'"';
+	    print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"';
 	}
 	print '>';
 	if (!empty($arrayfields['s.rowid']['checked']))
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index b65f0486d17..6d69e692a96 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -256,7 +256,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print load_fiche_titre($langs->trans('PriceByCustomer'));
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
 		print '<input type="hidden" name="socid" value="'.$object->id.'">';
 		print '<table class="border centpercent">';
@@ -334,7 +334,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		}
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-		print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="update_customer_price_confirm">';
 		print '<input type="hidden" name="lineid" value="'.$prodcustprice->id.'">';
 		print '<table class="border centpercent">';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 5067a4935bc..9d50d98e243 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1041,7 +1041,7 @@ if (empty($reshook))
 
 		if (!$error)
 		{
-			$result = $object->insertExtraFields('SUPPLIER_PROPOSAL_MODIFY');
+			$result = $object->insertExtraFields('PROPOSAL_SUPPLIER_MODIFY');
 			if ($result < 0)
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -1106,7 +1106,7 @@ if ($action == 'create')
 		$remise_absolue 	= (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
 
 		// Replicate extrafields
-		$objectsrc->fetch_optionals($originid);
+		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
 
 		if (!empty($conf->multicurrency->enabled))
@@ -1125,7 +1125,7 @@ if ($action == 'create')
 	$object = new SupplierProposal($db);
 
 	print '<form name="addprop" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 	if ($origin != 'project' && $originid) {
 		print '<input type="hidden" name="origin" value="'.$origin.'">';
@@ -1150,7 +1150,7 @@ if ($action == 'create')
 	} else {
 		print '<td colspan="2">';
 		print $form->select_company('', 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
-		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddThirdParty").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span></a>';
+		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
 		print '</td>';
 	}
 	print '</tr>'."\n";
@@ -1230,8 +1230,8 @@ if ($action == 'create')
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td colspan="2">';
 
-		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1);
-		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="valignmiddle text-plus-circle">'.$langs->trans("AddProject").'</span><span class="fa fa-plus-circle valignmiddle"></span></a>';
+		$numprojet = $formproject->select_projects(($soc->id > 0 ? $soc->id : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
+		print ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 
 		print '</td>';
 		print '</tr>';
@@ -1433,7 +1433,7 @@ if ($action == 'create')
 			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 			$notify = new Notify($db);
 			$text .= '<br>';
-			$text .= $notify->confirmMessage('SUPPLIER_PROPOSAL_VALIDATE', $object->socid, $object);
+			$text .= $notify->confirmMessage('PROPOSAL_SUPPLIER_VALIDATE', $object->socid, $object);
 		}
 
 		if (!$error)
@@ -1534,7 +1534,7 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentConditionsShort');
 	print '</td>';
-	if ($action != 'editconditions' && $object->statut == SupplierProposal::STATUS_DRAFT)
+	if ($action != 'editconditions' && $object->statut != SupplierProposal::STATUS_NOTSIGNED)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editconditions&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetConditions'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
@@ -1557,8 +1557,8 @@ if ($action == 'create')
 	print '</tr></table>';
 	print '</td><td colspan="3">';
 	if ($action == 'editdate_livraison') {
-		print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
-		print '<input type="hidden" name="token" value="'.$_SESSION ['newtoken'].'">';
+		print '<form name="editdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post" class="formconsumeproduce">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="setdate_livraison">';
 		print $form->selectDate($object->date_livraison, 'liv_', '', '', '', "editdate_livraison");
 		print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
@@ -1575,7 +1575,7 @@ if ($action == 'create')
 	print '<table class="nobordernopadding" width="100%"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
-	if ($action != 'editmode' && $object->statut == $object::STATUS_VALIDATED)
+	if ($action != 'editmode' && $object->statut != SupplierProposal::STATUS_NOTSIGNED)
 		print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=editmode&amp;id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetMode'), 1).'</a></td>';
 	print '</tr></table>';
 	print '</td><td colspan="3">';
@@ -1762,7 +1762,7 @@ if ($action == 'create')
 	$result = $object->getLinesArray();
 
 	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#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="' . (($action != 'editline') ? 'addline' : 'updateline').'">
 	<input type="hidden" name="mode" value="">
 	<input type="hidden" name="id" value="' . $object->id.'">
@@ -1806,12 +1806,13 @@ if ($action == 'create')
 	if ($action == 'statut')
 	{
 		// Form to set proposal accepted/refused
-		$form_close = '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
+		$form_close = '<form action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="POST" id="formacceptrefuse" class="formconsumeproduce">';
+		$form_close .= '<input type="hidden" name="token" value="' . newToken() . '">';
+		$form_close .= '<input type="hidden" name="action" value="setstatut">';
+
 		if (! empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL)) $form_close .= '<p class="notice">'.$langs->trans('SupplierProposalRefFournNotice').'</p>';  // TODO Suggest a permanent checkbox instead of option
-		$form_close .= '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
 		$form_close .= '<table class="border centpercent">';
 		$form_close .= '<tr><td width="150"  class="left">' . $langs->trans("CloseAs") . '</td><td class="left">';
-		$form_close .= '<input type="hidden" name="action" value="setstatut">';
 		$form_close .= '<select id="statut" name="statut" class="flat">';
 		$form_close .= '<option value="0">&nbsp;</option>';
 		$form_close .= '<option value="2">' . $langs->trans('SupplierProposalStatusSigned') . '</option>';
@@ -1882,7 +1883,7 @@ if ($action == 'create')
 
 				// Set accepted/refused
 				if ($object->statut == SupplierProposal::STATUS_VALIDATED && $user->rights->supplier_proposal->cloturer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused').'"';
+					print '<div class="inline-block divButAction"><a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=statut'.(empty($conf->global->MAIN_JUMP_TAG) ? '' : '#acceptedrefused').'"';
 					print '>'.$langs->trans('SetAcceptedRefused').'</a></div>';
 				}
 
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 0570b78bcdd..d1d3b08bc2d 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -13,7 +13,7 @@
  * Copyright (C) 2014      Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2016      Ferran Marcet            <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019      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
@@ -1481,7 +1481,7 @@ class SupplierProposal extends CommonObject
             if (!$error && !$notrigger)
             {
                 // Call trigger
-                $result = $this->call_trigger('SUPPLIER_PROPOSAL_VALIDATE', $user);
+                $result = $this->call_trigger('PROPOSAL_SUPPLIER_VALIDATE', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -1683,7 +1683,7 @@ class SupplierProposal extends CommonObject
             if (!$notrigger)
             {
                 // Call trigger
-                $result = $this->call_trigger('SUPPLIER_PROPOSAL_REOPEN', $user);
+                $result = $this->call_trigger('PROPOSAL_SUPPLIER_REOPEN', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
             }
@@ -1737,11 +1737,11 @@ class SupplierProposal extends CommonObject
         if ($resql)
         {
             $modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_CLOSED : $this->modelpdf;
-            $triggerName = 'SUPPLIER_PROPOSAL_CLOSE_REFUSED';
+            $triggerName = 'PROPOSAL_SUPPLIER_CLOSE_REFUSED';
 
             if ($status == 2)
             {
-                $triggerName = 'SUPPLIER_PROPOSAL_CLOSE_SIGNED';
+                $triggerName = 'PROPOSAL_SUPPLIER_CLOSE_SIGNED';
                 $modelpdf = $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL ? $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_TOBILL : $this->modelpdf;
 
                 if (!empty($conf->global->SUPPLIER_PROPOSAL_UPDATE_PRICE_ON_SUPPlIER_PROPOSAL))     // TODO This option was not tested correctly. Error if product ref does not exists
@@ -1751,7 +1751,7 @@ class SupplierProposal extends CommonObject
             }
             if ($status == 4)
             {
-                $triggerName = 'SUPPLIER_PROPOSAL_CLASSIFY_BILLED';
+                $triggerName = 'PROPOSAL_SUPPLIER_CLASSIFY_BILLED';
             }
 
             if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
@@ -1916,7 +1916,7 @@ class SupplierProposal extends CommonObject
 
             if (!$error) {
                 // Call trigger
-                $result = $this->call_trigger('SUPPLIER_PROPOSAL_UNVALIDATE', $user);
+                $result = $this->call_trigger('PROPOSAL_SUPPLIER_UNVALIDATE', $user);
                 if ($result < 0) $error++;
             }
 
@@ -2034,7 +2034,7 @@ class SupplierProposal extends CommonObject
         if (!$notrigger)
         {
             // Call trigger
-            $result = $this->call_trigger('SUPPLIER_PROPOSAL_DELETE', $user);
+            $result = $this->call_trigger('PROPOSAL_SUPPLIER_DELETE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
         }
@@ -2232,8 +2232,8 @@ class SupplierProposal extends CommonObject
     	$statusnew = '';
     	if ($status == self::STATUS_DRAFT) $statusnew = 'status0';
     	elseif ($status == self::STATUS_VALIDATED) $statusnew = 'status1';
-    	elseif ($status == self::STATUS_SIGNED) $statusnew = 'status3';
-    	elseif ($status == self::STATUS_NOTSIGNED) $statusnew = 'status5';
+    	elseif ($status == self::STATUS_SIGNED) $statusnew = 'status4';
+    	elseif ($status == self::STATUS_NOTSIGNED) $statusnew = 'status9';
     	elseif ($status == self::STATUS_CLOSE) $statusnew = 'status6';
 
     	return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusnew, $mode);
diff --git a/htdocs/supplier_proposal/index.php b/htdocs/supplier_proposal/index.php
index 57db269cc2e..b0c589010aa 100644
--- a/htdocs/supplier_proposal/index.php
+++ b/htdocs/supplier_proposal/index.php
@@ -19,9 +19,9 @@
  */
 
 /**
- *	\file       htdocs/comm/propal/index.php
- *	\ingroup    propal
- *	\brief      Home page of proposal area
+ *	\file       htdocs/supplier_proposal/index.php
+ *	\ingroup    supplier_proposal
+ *	\brief      Home page of vendor proposal area
  */
 
 require '../main.inc.php';
@@ -104,6 +104,7 @@ if ($resql)
     $total = 0;
     $totalinprocess = 0;
     $dataseries = array();
+    $colorseries = array();
     $vals = array();
     // -1=Canceled, 0=Draft, 1=Validated, (2=Accepted/On process not managed for customer orders), 3=Closed (Sent/Received, billed or not)
     while ($i < $num)
@@ -122,20 +123,28 @@ if ($resql)
     }
     $db->free($resql);
 
+    include_once DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
+
     print '<div class="div-table-responsive-no-min">';
     print '<table class="noborder centpercent">';
     print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CommRequests").'</th></tr>'."\n";
     $listofstatus = array(0, 1, 2, 3, 4);
     foreach ($listofstatus as $status)
     {
-        $dataseries[] = array($supplier_proposalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-        if (!$conf->use_javascript_ajax)
-        {
-            print '<tr class="oddeven">';
-            print '<td>'.$supplier_proposalstatic->LibStatut($status, 0).'</td>';
-            print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
-            print "</tr>\n";
-        }
+    	$dataseries[] = array($supplier_proposalstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
+    	if ($status == SupplierProposal::STATUS_DRAFT) $colorseries[$status] = '-'.$badgeStatus0;
+    	if ($status == SupplierProposal::STATUS_VALIDATED) $colorseries[$status] = $badgeStatus1;
+    	if ($status == SupplierProposal::STATUS_SIGNED) $colorseries[$status] = $badgeStatus4;
+    	if ($status == SupplierProposal::STATUS_NOTSIGNED) $colorseries[$status] = $badgeStatus9;
+    	if ($status == SupplierProposal::STATUS_CLOSE) $colorseries[$status] = $badgeStatus6;
+
+    	if (empty($conf->use_javascript_ajax))
+    	{
+    		print '<tr class="oddeven">';
+    		print '<td>'.$supplier_proposalstatic->LibStatut($status, 0).'</td>';
+    		print '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
+    		print "</tr>\n";
+    	}
     }
     if ($conf->use_javascript_ajax)
     {
@@ -144,6 +153,7 @@ if ($resql)
         include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
         $dolgraph = new DolGraph();
         $dolgraph->SetData($dataseries);
+        $dolgraph->SetDataColor(array_values($colorseries));
         $dolgraph->setShowLegend(2);
         $dolgraph->setShowPercent(1);
         $dolgraph->SetType(array('pie'));
@@ -282,7 +292,7 @@ if ($resql)
 			print '<td>'.$companystatic->getNomUrl(1, 'customer').'</td>';
 
 			print '<td>'.dol_print_date($db->jdate($obj->datec), 'day').'</td>';
-			print '<td class="right">'.$supplier_proposalstatic->LibStatut($obj->fk_statut, 5).'</td>';
+			print '<td class="right">'.$supplier_proposalstatic->LibStatut($obj->fk_statut, 3).'</td>';
 			print '</tr>';
 			$i++;
 		}
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 7b412cfe610..d50faa480cb 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -83,7 +83,6 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackT
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
 dol_fiche_head($head, 'receipt', 'TakePOS', -1);
-print '<br>';
 
 print '<form action="'.$_SERVER["PHP_SELF"].'?terminal='.(empty($terminal) ? 1 : $terminal).'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index a7967169db8..d21936bdaef 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -71,20 +71,12 @@ if ($action == 'set')
 	$db->begin();
 	if (GETPOST('socid', 'int') < 0) $_POST["socid"] = '';
 
-	$res = dolibarr_set_const($db, "CASHDESK_SERVICES", GETPOST('CASHDESK_SERVICES', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ROOT_CATEGORY_ID", GETPOST('TAKEPOS_ROOT_CATEGORY_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_TICKET_VAT_GROUPPED", GETPOST('TAKEPOS_TICKET_VAT_GROUPPED', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_ORDER_NOTES", GETPOST('TAKEPOS_ORDER_NOTES', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_PHONE_BASIC_LAYOUT", GETPOST('TAKEPOS_PHONE_BASIC_LAYOUT', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS", GETPOST('TAKEPOS_SUPPLEMENTS', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_SUPPLEMENTS_CATEGORY", GETPOST('TAKEPOS_SUPPLEMENTS_CATEGORY', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_NUMPAD", GETPOST('TAKEPOS_NUMPAD', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_SORTPRODUCTFIELD", GETPOST('TAKEPOS_SORTPRODUCTFIELD', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_COLOR_THEME", GETPOST('TAKEPOS_COLOR_THEME', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_NUM_TERMINALS", GETPOST('TAKEPOS_NUM_TERMINALS', 'alpha'), 'chaine', 0, '', $conf->entity);
-	$res = dolibarr_set_const($db, "TAKEPOS_DIRECT_PAYMENT", GETPOST('TAKEPOS_DIRECT_PAYMENT', 'int'), 'int', 0, '', $conf->entity);
 	$res = dolibarr_set_const($db, "TAKEPOS_ADDON", GETPOST('TAKEPOS_ADDON', 'alpha'), 'int', 0, '', $conf->entity);
     $res = dolibarr_set_const($db, "TAKEPOS_EMAIL_TEMPLATE_INVOICE", GETPOST('TAKEPOS_EMAIL_TEMPLATE_INVOICE', 'alpha'), 'chaine', 0, '', $conf->entity);
 	if (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) {
@@ -142,7 +134,6 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackT
 print load_fiche_titre($langs->trans("CashDeskSetup").' (TakePOS)', $linkback, 'title_setup');
 $head = takepos_prepare_head();
 dol_fiche_head($head, 'setup', 'TakePOS', -1);
-print '<br>';
 
 // Numbering modules
 $now = dol_now();
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 56c30b69283..89cf13956ac 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -39,7 +39,7 @@ $term = GETPOST('term', 'alpha');
 $id = GETPOST('id', 'int');
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 260813dd3b6..5af2eb1d238 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -42,13 +42,13 @@ $action = GETPOST('action', 'alpha');
 $left = GETPOST('left', 'alpha');
 $top = GETPOST('top', 'alpha');
 
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 
 $newname = GETPOST('newname', 'alpha');
 $mode = GETPOST('mode', 'alpha');
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 1d4e0dfc7be..ef0ff2ca4f4 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -40,13 +40,13 @@ global $mysoc;
 
 $langs->loadLangs(array("bills", "cashdesk"));
 
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant
 
 $idline = GETPOST('idline', 'int');
 $action = GETPOST('action', 'alpha');
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 // get invoice
@@ -83,15 +83,17 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 	 * @param   {string}    rate        VAT rate
 	 */
 	function ApplyVATRate(id, rate) {
+		console.log("Save selected VAT Rate into vatRate variable with value "+rate);
 		vatRate = rate;
 		jQuery('button.vat_rate').removeClass('selected');
-		jQuery('#vat_rate_' + id).addClass('selected');
+		jQuery('#vat_rate_'+id).addClass('selected');
 	}
 
 	/**
 	 * Save (validate)
 	 */
 	function Save() {
+		console.log("We click so we call page invoice.php with place=<?php echo $place; ?> tva_tx="+vatRate);
 		$.get( "invoice.php", { action: "<?php echo $action; ?>", place: "<?php echo $place; ?>", desc:$('#desc').val(), number:$('#number').val(), tva_tx: vatRate} );
 		parent.$.colorbox.close();
 	}
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 9615f90d539..9f3a259e441 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Bar or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant or multiple sales
 $action = GETPOST('action', 'alpha');
 $setterminal = GETPOST('setterminal', 'int');
 
@@ -435,12 +435,12 @@ function Floors() {
 
 function FreeZone() {
 	console.log("Open box to enter a free product");
-	$.colorbox({href:"freezone.php?action=freezone&place="+place, onClosed: function () { Refresh(); },width:"80%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
+	$.colorbox({href:"freezone.php?action=freezone&place="+place, onClosed: function () { Refresh(); },width:"80%", height:"200px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("FreeZone"); ?>"});
 }
 
 function TakeposOrderNotes() {
 	console.log("Open box to order notes");
-	$.colorbox({href:"freezone.php?action=addnote&place="+place+"&idline="+selectedline, onClosed: function () { Refresh(); },width:"80%", height:"30%", transition:"none", iframe:"true", title:"<?php echo $langs->trans("OrderNotes"); ?>"});
+	$.colorbox({href:"freezone.php?action=addnote&place="+place+"&idline="+selectedline, onClosed: function () { Refresh(); },width:"80%", height:"250px", transition:"none", iframe:"true", title:"<?php echo $langs->trans("OrderNotes"); ?>"});
 }
 
 function Refresh() {
@@ -689,7 +689,7 @@ function TerminalsDialog()
 
 function DirectPayment(){
 	console.log("DirectPayment");
-	$("#poslines").load("invoice.php?place"+place+"&action=valid&pay=<?php echo $langs->trans("cash"); ?>", function() {
+	$("#poslines").load("invoice.php?place="+place+"&action=valid&pay=<?php echo $langs->trans("cash"); ?>", function() {
 	});
 }
 
@@ -714,7 +714,7 @@ $( document ).ready(function() {
 
 <body class="bodytakepos" style="overflow: hidden;">
 <?php
-print '<div class="hidden" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
+print '<div class="hidden dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
 $keyCodeForEnter = $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} > 0 ? $conf->global->{'CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']} : '';
 ?>
 <div class="container">
@@ -732,7 +732,8 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
 			?>
 			</a></div>
-			<div class="inline-block valignmiddle"><a class="valignmiddle" id="customer" onclick="Customer();"></a></div>
+			<div class="inline-block valignmiddle" id="customerandsales">
+			</div>
 			<div class="inline-block valignmiddle" id="moreinfo"></div>
 			<div class="inline-block valignmiddle" id="infowarehouse"></div>
 			</div>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 683b74edc4b..6251b5b57b0 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -44,11 +44,11 @@ $langs->loadLangs(array("companies", "commercial", "bills", "cashdesk", "stocks"
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'alpha');
 $idproduct = GETPOST('idproduct', 'int');
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Bar or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 $placeid = 0; // $placeid is ID of invoice
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 
@@ -395,6 +395,14 @@ if ($action == "deleteline") {
 
 if ($action == "delete") {
 	// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.
+
+	/*$reg = array();
+	if (preg_match('/^(\d+)-(\d+)$/', $place, $reg)) {
+
+		$place = $reg[1];
+		var_dump($place);
+	}*/
+
 	if ($placeid > 0) {
         $result = $invoice->fetch($placeid);
 
@@ -407,7 +415,8 @@ if ($action == "delete") {
         	$resql1 = $db->query($sql);
         	$sql = "DELETE FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".$placeid;
             $resql2 = $db->query($sql);
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]}." where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set fk_soc=".$conf->global->{'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"]};
+			$sql.= " WHERE ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
 			$resql3 = $db->query($sql);
 
             if ($resql1 && $resql2 && $resql3)
@@ -708,14 +717,37 @@ $( document ).ready(function() {
 
     <?php
     $s = $langs->trans("Customer");
-    if ($invoice->socid != $conf->global->$constforcompanyid) {
+    if ($invoice->id > 0 && ($invoice->socid != $conf->global->$constforcompanyid)) {
     	$s = $soc->name;
     }
     ?>
 
-    $("a#customer").html('<?php print dol_escape_js($s); ?>');
+    $("#customerandsales").html('<a class="valignmiddle" id="customer" onclick="Customer();"><?php print dol_escape_js($s); ?></a>');
 
 	<?php
+	$sql = "SELECT rowid, datec, ref FROM ".MAIN_DB_PREFIX."facture";
+	$sql.= " WHERE ref LIKE '(PROV-POS".$_SESSION["takeposterminal"]."-0%'";
+	$sql.= $db->order('datec', 'ASC');
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			echo '$("#customerandsales").append(\'';
+			if ($placeid==$obj->rowid) echo "<b>";
+			echo '<a class="valignmiddle" onclick="place=\\\'';
+			$num_sale=str_replace(")", "", str_replace("(PROV-POS".$_SESSION["takeposterminal"]."-", "", $obj->ref));
+			echo $num_sale;
+			if (str_replace("-", "", $num_sale)>$max_sale) $max_sale=str_replace("-", "", $num_sale);
+			echo '\\\';Refresh();">'.date('H:i', strtotime($obj->datec));
+			if ($placeid==$obj->rowid) echo "</b>";
+			echo '</a>\');';
+		}
+		echo '$("#customerandsales").append(\'<a onclick="place=\\\'0-';
+		echo $max_sale+1;
+		echo '\\\';Refresh();"><span class="fa fa-plus-square" title="'.dol_escape_htmltag($langs->trans("StartAParallelSale")).'"></a>\');';
+	} else {
+		dol_print_error($db);
+	}
+
 	$s = '';
 
     $constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
@@ -967,8 +999,7 @@ if ($placeid > 0)
 				$moreinfo = '';
 				$moreinfo .= $langs->transcountry("TotalHT", $mysoc->country_code).': '.price($line->total_ht);
 				if ($line->vat_src_code) $moreinfo .= '<br>'.$langs->trans("VATCode").': '.$line->vat_src_code;
-				$moreinfo .= '<br>'.$langs->transcountry("TotalVAT", $mysoc->country_code).': '.price($line->total_vat);
-				//$moreinfo .= '<br>'.$langs->transcountry("VATRate", $mysoc->country_code).': '.price($line->);
+				$moreinfo .= '<br>'.$langs->transcountry("TotalVAT", $mysoc->country_code).': '.price($line->total_tva);
 				$moreinfo .= '<br>'.$langs->transcountry("TotalLT1", $mysoc->country_code).': '.price($line->total_localtax1);
 				$moreinfo .= '<br>'.$langs->transcountry("TotalLT2", $mysoc->country_code).': '.price($line->total_localtax2);
 				$moreinfo .= '<br>'.$langs->transcountry("TotalTTC", $mysoc->country_code).': '.price($line->total_ttc);
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index f79e310f36b..b2534272ae2 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -34,12 +34,12 @@ if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place is id of table for Bar or Restaurant
 
 $invoiceid = GETPOST('invoiceid', 'int');
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index c32561d3f52..b2526ef885e 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 $action = GETPOST('action', 'alpha');
 $setterminal = GETPOST('setterminal', 'int');
 
@@ -49,7 +49,7 @@ if ($setterminal > 0)
 $langs->loadLangs(array("bills", "orders", "commercial", "cashdesk", "receiptprinter"));
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 
@@ -171,7 +171,7 @@ function Exit(){
 
 <body style="overflow: hidden; background-color:#D1D1D1;">
 <?php
-if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
+if ($conf->global->TAKEPOS_NUM_TERMINALS != "1" && $_SESSION["takeposterminal"] == "") print '<div class="dialog-info-takepos-terminal" id="dialog-info" title="TakePOS">'.$langs->trans('TerminalSelect').'</div>';
 ?>
 <div class="container">
 	<div class="phonebuttonsrow">
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index 31390c347bd..c025f504d73 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -30,12 +30,12 @@ include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 $langs->loadLangs(array("main", "cashdesk", "companies"));
 
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 
 $facid = GETPOST('facid', 'int');
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 7ad3e88d2b5..ae5081ca891 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -34,12 +34,12 @@ if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-$place = (GETPOST('place', 'int') > 0 ? GETPOST('place', 'int') : 0); // $place is id of table for Ba or Restaurant
+$place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Ba or Restaurant
 
 $invoiceid = GETPOST('invoiceid', 'int');
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index 8078ddc1787..5774c9bbaf1 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 $invoiceid = GETPOST('facid', 'int');
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index 6bf81b1cdf6..0e25a0cb7b0 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -8,7 +8,7 @@ if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 require '../main.inc.php';
 
 if (empty($user->rights->takepos->run)) {
-	access_forbidden();
+	accessforbidden();
 }
 
 if (isset($_GET['status'])) {
diff --git a/htdocs/theme/eldy/badges.inc.php b/htdocs/theme/eldy/badges.inc.php
index 48619dfc7d0..ae02a8e7f73 100644
--- a/htdocs/theme/eldy/badges.inc.php
+++ b/htdocs/theme/eldy/badges.inc.php
@@ -1,9 +1,6 @@
 <?php
 if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
-/* <style type="text/css" > */
-/*
- Badge style is based on boostrap framework
- */
+/* Badge style is based on boostrap framework */
 
 .badge {
     display: inline-block;
@@ -121,13 +118,13 @@ a.badge-warning:focus, a.badge-warning:hover {
 }
 
 /* WARNING colorblind */
-body[class^="colorblind-"] .badge-warning {
+body[class*="colorblind-"] .badge-warning {
 	  background-color: <?php print $colorblind_deuteranopes_badgeWarning; ?>;
   }
-body[class^="colorblind-"] a.badge-warning.focus,body[class^="colorblind-"] a.badge-warning:focus {
+body[class*="colorblind-"] a.badge-warning.focus,body[class^="colorblind-"] a.badge-warning:focus {
 	box-shadow: 0 0 0 0.2rem <?php print colorHexToRgb($colorblind_deuteranopes_badgeWarning, 0.5); ?>;
 }
-body[class^="colorblind-"] a.badge-warning:focus, a.badge-warning:hover {
+body[class*="colorblind-"] a.badge-warning:focus, a.badge-warning:hover {
 	background-color: <?php print colorDarker($colorblind_deuteranopes_badgeWarning, 10); ?>;
 }
 
@@ -174,9 +171,7 @@ a.badge-dark:focus, a.badge-dark:hover {
 }
 
 
-/*
- * STATUS BADGES
- */
+/* STATUS BADGES */
 <?php
 for ($i = 0; $i <= 9; $i++) {
 	/* Default Status */
@@ -186,6 +181,10 @@ for ($i = 0; $i <= 9; $i++) {
 	_createStatusBadgeCss($i, 'colorblind_deuteranopes_', "COLORBLIND STATUS".$i, 'body[class*="colorblind-"] ');
 }
 
+_createStatusBadgeCss('1b', '', "STATUS1b");
+_createStatusBadgeCss('4b', '', "STATUS4b");
+
+
 /**
  * Create status badge
  *
@@ -202,26 +201,27 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 
 	if (!empty(${$statusVarNamePrefix.'badgeStatus'.$statusName})) {
 		print "\n/* ".strtoupper($commentLabel)." */\n";
+
 		$thisBadgeBackgroundColor = $thisBadgeBorderColor = ${$statusVarNamePrefix.'badgeStatus'.$statusName};
 
-		$TBadgeBorderOnly = array(0, 3, 5, 7);
+		$TBadgeBorderOnly = array('0', '1b', '3', '4b', '5', '7');
 		$thisBadgeTextColor = colorIsLight(${$statusVarNamePrefix.'badgeStatus'.$statusName}) ? '#212529' : '#ffffff';
 
 		if (!empty(${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName})) {
 			$thisBadgeTextColor = ${$statusVarNamePrefix.'badgeStatus_textColor'.$statusName};
 		}
 
-		if (in_array($statusName, $TBadgeBorderOnly)) {
+		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
 			$thisBadgeTextColor = '#212529';
 			$thisBadgeBackgroundColor = "#fff";
 		}
 
-		if (in_array($statusName, array(0, 5, 9))) $thisBadgeTextColor = '#999999';
-		if (in_array($statusName, array(6))) $thisBadgeTextColor = '#777777';
+		if (in_array((string) $statusName, array('0', '5', '9'))) $thisBadgeTextColor = '#999999';
+		if (in_array((string) $statusName, array('6'))) $thisBadgeTextColor = '#777777';
 
 		print $cssPrefix.".badge-status".$statusName." {\n";
 		print "        color: ".$thisBadgeTextColor." !important;\n";
-		if (in_array($statusName, $TBadgeBorderOnly)) {
+		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
 			print "        border-color: ".$thisBadgeBorderColor.";\n";
 		}
 		print "        background-color: ".$thisBadgeBackgroundColor.";\n";
@@ -239,7 +239,7 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
 		print $cssPrefix.".badge-status".$statusName.":focus, ".$cssPrefix.".badge-status".$statusName.":hover {\n";
 		print "    color: ".$thisBadgeTextColor." !important;\n";
 		//print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
-		if (in_array($statusName, $TBadgeBorderOnly)) {
+		if (in_array((string) $statusName, $TBadgeBorderOnly)) {
 			print "        border-color: ".colorDarker($thisBadgeBorderColor, 10).";\n";
 		}
 		print "}\n";
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index bfe55597316..e930eef3f03 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -164,7 +164,9 @@ button.dropdown-item.global-search-item {
 }
 
 div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown {
-    line-height: 46px;
+	<?php if (empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { ?>
+		line-height: 46px;
+	<?php } ?>
 }
 a.top-menu-dropdown-link {
     padding: 8px;
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index e590532a11f..4f32c938a49 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -175,6 +175,14 @@ input, select {
 	margin-bottom:1px;
 	margin-top:1px;
 }
+input.button {
+	background: var(--butactionbg);
+    border-collapse: collapse;
+    border: none;
+}
+input.button:focus {
+	border-bottom: 0;
+}
 input.button.massactionconfirmed {
     margin: 4px;
 }
@@ -298,12 +306,14 @@ td.onholidaymorning, td.onholidayafternoon {
 td.onholidayallday {
 	background-color: #f4eede;
 }
+/*
 td.leftborder, td.hide0 {
 	border-left: 1px solid #ccc;
 }
 td.leftborder, td.hide6 {
 	border-right: 1px solid #ccc;
 }
+*/
 td.rightborder {
 	border-right: 1px solid #ccc;
 }
@@ -398,7 +408,8 @@ hr { border: 0; border-top: 1px solid #ccc; }
 	margin-right: 5px;
 	font-family: <?php print $fontlist ?>;
 	display: inline-block;
-	padding: 4px 14px;
+	padding: 8px 15px;
+	min-width: 90px;
 	text-align: center;
 	cursor: pointer;
 	text-decoration: none !important;
@@ -636,10 +647,10 @@ body[class*="colorblind-"] .text-success{
     color : <?php print $textDanger; ?>
 }
 
-.editfielda span.fa-pencil-alt, .editfielda span.fa-trash {
+.editfielda span.fa-pencil-alt, .editfielda span.fa-trash, .editfieldlang {
     color: #ccc !important;
 }
-.editfielda span.fa-pencil-alt:hover, .editfielda span.fa-trash:hover {
+.editfielda span.fa-pencil-alt:hover, .editfielda span.fa-trash:hover, .editfieldlang:hover {
     color: var(--colortexttitle) !important;
 }
 
@@ -2817,7 +2828,7 @@ div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border
 }
 div .tdtop {
     vertical-align: top !important;
-	/* padding-top: 8px !important; */
+	padding-top: 10px !important;
 	padding-bottom: 2px !important;
 	padding-bottom: 0px;
 }
@@ -3222,6 +3233,9 @@ td.evenodd, tr.nohoverpair td, #trlinefordates td {
     border-bottom: 1pt solid black !important;
 	/* background-color: #<?php echo colorArrayToHex(colorStringToArray($colorbacklinebreak)); ?> !important; */
 }
+.trforbreak.nobold td a, .trforbreak.nobold span.secondary {
+    font-weight: normal !important;
+}
 
 table.dataTable td {
     padding: 5px 8px 5px 8px !important;
@@ -4982,6 +4996,10 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+span#select2-taskid-container[title^='--'] {
+    opacity: 0.3;
+}
+
 .select2-container--default .select2-results__option--highlighted[aria-selected] {
     background-color: rgb(<?php echo $colorbackhmenu1 ?>);
     color: #<?php echo $colortextbackhmenu; ?>;
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 033637759c9..88357f02404 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -316,6 +316,13 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 	height: 0;
 }
 
+.info-box-module {
+	min-width: 350px;
+    max-width: 350px;
+}
+.info-box-module .info-box-content {
+	height: 7em;
+}
 /* Disabled. This break the responsive on smartphone
 .box{
 	overflow: visible;
@@ -327,4 +334,8 @@ if (GETPOSTISSET('THEME_AGRESSIVENESS_RATIO')) $conf->global->THEME_AGRESSIVENES
 	.box-flex-container {
 	    margin: 0 0 0 0 !important;
 	}
+
+	.info-box-module {
+		width: 280px;
+	}
 }
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index 81a6aa3b4c5..45afe673248 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -143,8 +143,31 @@ div.mainmenu.generic4::before {
     content: "\f249";
 }
 
+/* Define color of some picto */
+
+.fa-phone, .fa-fax {
+	opacity: 0.5;
+	color: #440;
+}
+.fa-at, .fa-external-link-alt {
+	opacity: 0.5;
+	color: #304;
+}
+.fa-trash {
+	color: #666;
+}
+.fa-trash:hover:before {
+	color: #800;
+}
+.fa-play {
+	color: #444;
+}
+.fa-unlink {
+	color: #555;
+}
 
 /* Define square Dolibarr logo in pure CSS */
+
 .fa-dolibarr-css{
 	color: #235481;
 	background: currentColor;
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index 750db266dfd..6df6d3480a8 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -145,16 +145,21 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
     background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
     background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
-.progress-bar-green,
-.progress-bar-success {
+.progress-bar-green, .progress-bar-success {
     background-color: <?php echo $badgeSuccess ?>;
 }
-.progress-striped .progress-bar-green,
-.progress-striped .progress-bar-success {
+.progress-striped .progress-bar-green, .progress-striped .progress-bar-success {
     background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
     background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
     background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
+body[class*="colorblind-"] .progress-bar-green, body[class*="colorblind-"] .progress-bar-success {
+    background-color: <?php echo $colorblind_deuteranopes_badgeSuccess ?>;
+}
+body[class*="colorblind-"] .progress-bar-red, body[class*="colorblind-"] .progress-bar-danger {
+    background-color: <?php echo $colorblind_deuteranopes_badgeDanger ?>;
+}
+
 .progress-bar-aqua,
 .progress-bar-info {
     background-color: #00c0ef;
diff --git a/htdocs/theme/eldy/theme_vars.inc.php b/htdocs/theme/eldy/theme_vars.inc.php
index 4dd4b7627a8..b0ab509dc5c 100644
--- a/htdocs/theme/eldy/theme_vars.inc.php
+++ b/htdocs/theme/eldy/theme_vars.inc.php
@@ -99,16 +99,19 @@ $badgeLight     = '#f8f9fa';
 $colorblind_deuteranopes_badgeSuccess   = '#37de5d'; //! text color black
 $colorblind_deuteranopes_badgeSuccess_textColor7 = '#000';
 $colorblind_deuteranopes_badgeWarning   = '#e4e411';
+$colorblind_deuteranopes_badgeDanger    = $badgeDanger; // currently not tested with a color blind people so use default color
 
 /* default color for status : After a quick check, somme status can have oposite function according to objects
 *  So this badges status uses default value according to theme eldy status img
 *  TODO: use color definition vars above for define badges color status X -> exemple $badgeStatusValidate, $badgeStatusClosed, $badgeStatusActive ....
 */
-$badgeStatus0 = '#cbd3d3';
-$badgeStatus1 = '#bc9526';
-$badgeStatus2 = '#e6f0f0';
+$badgeStatus0 = '#cbd3d3';	// draft
+$badgeStatus1 = '#bc9526';	// validated
+$badgeStatus1b = '#bc9526';	// validated
+$badgeStatus2 = '#9c9c26';	// approved
 $badgeStatus3 = '#bca52b';
 $badgeStatus4 = '#55a580'; // Color ok
+$badgeStatus4b = '#55a580'; // Color ok
 $badgeStatus5 = '#cad2d2';
 $badgeStatus6 = '#cad2d2';
 $badgeStatus7 = '#baa32b';
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 33b9635bb68..2a1aa367656 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -2949,7 +2949,6 @@ table.paddingtopbottomonly tr td {
 	background: rgb(<?php echo $colorbacktitle1; ?>) !important;
 }
 tr.liste_titre_filter td.liste_titre {
-    border-bottom: 1px solid #FDFFFF;
 	padding-top: 4px;
 	padding-bottom: 3px;
 }
@@ -4986,6 +4985,10 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
+span#select2-taskid-container[title^='--'] {
+    opacity: 0.3;
+}
+
 input.select2-input {
 	border-bottom: none ! important;
 }
diff --git a/htdocs/ticket/class/utils_diff.class.php b/htdocs/ticket/class/utils_diff.class.php
index a8e3712ec9b..7a4a3ff96ad 100644
--- a/htdocs/ticket/class/utils_diff.class.php
+++ b/htdocs/ticket/class/utils_diff.class.php
@@ -15,12 +15,12 @@
  */
 class Diff
 {
-    // define the constants
-    const UNMODIFIED = 0;
-    const DELETED = 1;
-    const INSERTED = 2;
+	// define the constants
+	const UNMODIFIED = 0;
+	const DELETED = 1;
+	const INSERTED = 2;
 
-    /* Returns the diff for two strings. The return value is an array, each of
+	/* Returns the diff for two strings. The return value is an array, each of
      * whose values is an array containing two values: a line (or character, if
      * $compareCharacters is true), and one of the constants DIFF::UNMODIFIED (the
      * line or character is in both strings), DIFF::DELETED (the line or character
@@ -32,86 +32,86 @@ class Diff
      * $compareCharacters - true to compare characters, and false to compare
      *                      lines; this optional parameter defaults to false
      */
-    public static function compare(
-        $string1,
-        $string2,
-        $compareCharacters = false
-    ) {
+	public static function compare(
+		$string1,
+		$string2,
+		$compareCharacters = false
+	) {
 
-        // initialise the sequences and comparison start and end positions
-        $start = 0;
-        if ($compareCharacters) {
-            $sequence1 = $string1;
-            $sequence2 = $string2;
-            $end1 = strlen($string1) - 1;
-            $end2 = strlen($string2) - 1;
-        } else {
-            $sequence1 = preg_split('/\R/', $string1);
-            $sequence2 = preg_split('/\R/', $string2);
-            $end1 = count($sequence1) - 1;
-            $end2 = count($sequence2) - 1;
-        }
+		// initialise the sequences and comparison start and end positions
+		$start = 0;
+		if ($compareCharacters) {
+			$sequence1 = $string1;
+			$sequence2 = $string2;
+			$end1 = strlen($string1) - 1;
+			$end2 = strlen($string2) - 1;
+		} else {
+			$sequence1 = preg_split('/\R/', $string1);
+			$sequence2 = preg_split('/\R/', $string2);
+			$end1 = count($sequence1) - 1;
+			$end2 = count($sequence2) - 1;
+		}
 
-        // skip any common prefix
-        while ($start <= $end1 && $start <= $end2
-            && $sequence1[$start] == $sequence2[$start]) {
-            $start++;
-        }
+		// skip any common prefix
+		while ($start <= $end1 && $start <= $end2
+			&& $sequence1[$start] == $sequence2[$start]) {
+			$start++;
+		}
 
-        // skip any common suffix
-        while ($end1 >= $start && $end2 >= $start
-            && $sequence1[$end1] == $sequence2[$end2]) {
-            $end1--;
-            $end2--;
-        }
+		// skip any common suffix
+		while ($end1 >= $start && $end2 >= $start
+			&& $sequence1[$end1] == $sequence2[$end2]) {
+			$end1--;
+			$end2--;
+		}
 
-        // compute the table of longest common subsequence lengths
-        $table = self::computeTable($sequence1, $sequence2, $start, $end1, $end2);
+		// compute the table of longest common subsequence lengths
+		$table = self::computeTable($sequence1, $sequence2, $start, $end1, $end2);
 
-        // generate the partial diff
-        $partialDiff = self::generatePartialDiff($table, $sequence1, $sequence2, $start);
+		// generate the partial diff
+		$partialDiff = self::generatePartialDiff($table, $sequence1, $sequence2, $start);
 
-        // generate the full diff
-        $diff = array();
-        for ($index = 0; $index < $start; $index++) {
-            $diff[] = array($sequence1[$index], self::UNMODIFIED);
-        }
-        while (count($partialDiff) > 0) {
-            $diff[] = array_pop($partialDiff);
-        }
+		// generate the full diff
+		$diff = array();
+		for ($index = 0; $index < $start; $index++) {
+			$diff[] = array($sequence1[$index], self::UNMODIFIED);
+		}
+		while (count($partialDiff) > 0) {
+			$diff[] = array_pop($partialDiff);
+		}
 
-        $end2 = ($compareCharacters ? strlen($sequence1) : count($sequence1));
-        for ($index = $end1 + 1; $index < $end2; $index++)
-        {
-            $diff[] = array($sequence1[$index], self::UNMODIFIED);
-        }
+		$end2 = ($compareCharacters ? strlen($sequence1) : count($sequence1));
+		for ($index = $end1 + 1; $index < $end2; $index++)
+		{
+			$diff[] = array($sequence1[$index], self::UNMODIFIED);
+		}
 
-        // return the diff
-        return $diff;
-    }
+		// return the diff
+		return $diff;
+	}
 
-    /* Returns the diff for two files. The parameters are:
+	/* Returns the diff for two files. The parameters are:
      *
      * $file1             - the path to the first file
      * $file2             - the path to the second file
      * $compareCharacters - true to compare characters, and false to compare
      *                      lines; this optional parameter defaults to false
      */
-    public static function compareFiles(
-        $file1,
-        $file2,
-        $compareCharacters = false
-    ) {
+	public static function compareFiles(
+		$file1,
+		$file2,
+		$compareCharacters = false
+	) {
 
-        // return the diff of the files
-        return self::compare(
-            file_get_contents($file1),
-            file_get_contents($file2),
-            $compareCharacters
-        );
-    }
+		// return the diff of the files
+		return self::compare(
+			file_get_contents($file1),
+			file_get_contents($file2),
+			$compareCharacters
+		);
+	}
 
-    /* Returns the table of longest common subsequence lengths for the specified
+	/* Returns the table of longest common subsequence lengths for the specified
      * sequences. The parameters are:
      *
      * $sequence1 - the first sequence
@@ -120,43 +120,43 @@ class Diff
      * $end1      - the ending index for the first sequence
      * $end2      - the ending index for the second sequence
      */
-    private static function computeTable(
-        $sequence1,
-        $sequence2,
-        $start,
-        $end1,
-        $end2
-    ) {
+	private static function computeTable(
+		$sequence1,
+		$sequence2,
+		$start,
+		$end1,
+		$end2
+	) {
 
-        // determine the lengths to be compared
-        $length1 = $end1 - $start + 1;
-        $length2 = $end2 - $start + 1;
+		// determine the lengths to be compared
+		$length1 = $end1 - $start + 1;
+		$length2 = $end2 - $start + 1;
 
-        // initialise the table
-        $table = array(array_fill(0, $length2 + 1, 0));
+		// initialise the table
+		$table = array(array_fill(0, $length2 + 1, 0));
 
-        // loop over the rows
-        for ($index1 = 1; $index1 <= $length1; $index1++) {
-            // create the new row
-            $table[$index1] = array(0);
+		// loop over the rows
+		for ($index1 = 1; $index1 <= $length1; $index1++) {
+			// create the new row
+			$table[$index1] = array(0);
 
-            // loop over the columns
-            for ($index2 = 1; $index2 <= $length2; $index2++) {
-                // store the longest common subsequence length
-                if ($sequence1[$index1 + $start - 1]== $sequence2[$index2 + $start - 1]
-                ) {
-                    $table[$index1][$index2] = $table[$index1 - 1][$index2 - 1] + 1;
-                } else {
-                    $table[$index1][$index2] = max($table[$index1 - 1][$index2], $table[$index1][$index2 - 1]);
-                }
-            }
-        }
+			// loop over the columns
+			for ($index2 = 1; $index2 <= $length2; $index2++) {
+				// store the longest common subsequence length
+				if ($sequence1[$index1 + $start - 1]== $sequence2[$index2 + $start - 1]
+				) {
+					$table[$index1][$index2] = $table[$index1 - 1][$index2 - 1] + 1;
+				} else {
+					$table[$index1][$index2] = max($table[$index1 - 1][$index2], $table[$index1][$index2 - 1]);
+				}
+			}
+		}
 
-        // return the table
-        return $table;
-    }
+		// return the table
+		return $table;
+	}
 
-    /* Returns the partial diff for the specificed sequences, in reverse order.
+	/* Returns the partial diff for the specificed sequences, in reverse order.
      * The parameters are:
      *
      * $table     - the table returned by the computeTable function
@@ -164,48 +164,48 @@ class Diff
      * $sequence2 - the second sequence
      * $start     - the starting index
      */
-    private static function generatePartialDiff(
-        $table,
-        $sequence1,
-        $sequence2,
-        $start
-    ) {
+	private static function generatePartialDiff(
+		$table,
+		$sequence1,
+		$sequence2,
+		$start
+	) {
 
-        //  initialise the diff
-        $diff = array();
+		//  initialise the diff
+		$diff = array();
 
-        // initialise the indices
-        $index1 = count($table) - 1;
-        $index2 = count($table[0]) - 1;
+		// initialise the indices
+		$index1 = count($table) - 1;
+		$index2 = count($table[0]) - 1;
 
-        // loop until there are no items remaining in either sequence
-        while ($index1 > 0 || $index2 > 0) {
-            // check what has happened to the items at these indices
-            if ($index1 > 0 && $index2 > 0
-                && $sequence1[$index1 + $start - 1]== $sequence2[$index2 + $start - 1]
-            ) {
-                // update the diff and the indices
-                $diff[] = array($sequence1[$index1 + $start - 1], self::UNMODIFIED);
-                $index1--;
-                $index2--;
-            } elseif ($index2 > 0
-                && $table[$index1][$index2] == $table[$index1][$index2 - 1]
-            ) {
-                // update the diff and the indices
-                $diff[] = array($sequence2[$index2 + $start - 1], self::INSERTED);
-                $index2--;
-            } else {
-                // update the diff and the indices
-                $diff[] = array($sequence1[$index1 + $start - 1], self::DELETED);
-                $index1--;
-            }
-        }
+		// loop until there are no items remaining in either sequence
+		while ($index1 > 0 || $index2 > 0) {
+			// check what has happened to the items at these indices
+			if ($index1 > 0 && $index2 > 0
+				&& $sequence1[$index1 + $start - 1]== $sequence2[$index2 + $start - 1]
+			) {
+				// update the diff and the indices
+				$diff[] = array($sequence1[$index1 + $start - 1], self::UNMODIFIED);
+				$index1--;
+				$index2--;
+			} elseif ($index2 > 0
+				&& $table[$index1][$index2] == $table[$index1][$index2 - 1]
+			) {
+				// update the diff and the indices
+				$diff[] = array($sequence2[$index2 + $start - 1], self::INSERTED);
+				$index2--;
+			} else {
+				// update the diff and the indices
+				$diff[] = array($sequence1[$index1 + $start - 1], self::DELETED);
+				$index1--;
+			}
+		}
 
-        // return the diff
-        return $diff;
-    }
+		// return the diff
+		return $diff;
+	}
 
-    /* Returns a diff as a string, where unmodified lines are prefixed by '  ',
+	/* Returns a diff as a string, where unmodified lines are prefixed by '  ',
      * deletions are prefixed by '- ', and insertions are prefixed by '+ '. The
      * parameters are:
      *
@@ -213,36 +213,36 @@ class Diff
      * $separator - the separator between lines; this optional parameter defaults
      *              to "\n"
      */
-    public static function toString($diff, $separator = "\n")
-    {
+	public static function toString($diff, $separator = "\n")
+	{
 
-        // initialise the string
-        $string = '';
+		// initialise the string
+		$string = '';
 
-        // loop over the lines in the diff
-        foreach ($diff as $line) {
-            // extend the string with the line
-            switch ($line[1]) {
-                case self::UNMODIFIED:
-                    $string .= '  ' . $line[0];
-                    break;
-                case self::DELETED:
-                    $string .= '- ' . $line[0];
-                    break;
-                case self::INSERTED:
-                    $string .= '+ ' . $line[0];
-                    break;
-            }
+		// loop over the lines in the diff
+		foreach ($diff as $line) {
+			// extend the string with the line
+			switch ($line[1]) {
+				case self::UNMODIFIED:
+					$string .= '  ' . $line[0];
+					break;
+				case self::DELETED:
+					$string .= '- ' . $line[0];
+					break;
+				case self::INSERTED:
+					$string .= '+ ' . $line[0];
+					break;
+			}
 
-            // extend the string with the separator
-            $string .= $separator;
-        }
+			// extend the string with the separator
+			$string .= $separator;
+		}
 
-        // return the string
-        return $string;
-    }
+		// return the string
+		return $string;
+	}
 
-    /* Returns a diff as an HTML string, where unmodified lines are contained
+	/* Returns a diff as an HTML string, where unmodified lines are contained
      * within 'span' elements, deletions are contained within 'del' elements, and
      * insertions are contained within 'ins' elements. The parameters are:
      *
@@ -250,40 +250,40 @@ class Diff
      * $separator - the separator between lines; this optional parameter defaults
      *              to '<br>'
      */
-    public static function toHTML($diff, $separator = '<br>')
-    {
+	public static function toHTML($diff, $separator = '<br>')
+	{
 
-        // initialise the HTML
-        $html = '';
+		// initialise the HTML
+		$html = '';
 
-        // loop over the lines in the diff
-        foreach ($diff as $line) {
-            // extend the HTML with the line
-            switch ($line[1]) {
-                case self::UNMODIFIED:
-                    $element = 'span';
-                    break;
-                case self::DELETED:
-                    $element = 'del';
-                    break;
-                case self::INSERTED:
-                    $element = 'ins';
-                    break;
-            }
-            $html .=
-            '<' . $element . '>'
-            . htmlspecialchars($line[0])
-                . '</' . $element . '>';
+		// loop over the lines in the diff
+		foreach ($diff as $line) {
+			// extend the HTML with the line
+			switch ($line[1]) {
+				case self::UNMODIFIED:
+					$element = 'span';
+					break;
+				case self::DELETED:
+					$element = 'del';
+					break;
+				case self::INSERTED:
+					$element = 'ins';
+					break;
+			}
+			$html .=
+			'<' . $element . '>'
+			. htmlspecialchars($line[0])
+				. '</' . $element . '>';
 
-            // extend the HTML with the separator
-            $html .= $separator;
-        }
+			// extend the HTML with the separator
+			$html .= $separator;
+		}
 
-        // return the HTML
-        return $html;
-    }
+		// return the HTML
+		return $html;
+	}
 
-    /* Returns a diff as an HTML table. The parameters are:
+	/* Returns a diff as an HTML table. The parameters are:
      *
      * $diff        - the diff array
      * $indentation - indentation to add to every line of the generated HTML; this
@@ -291,89 +291,89 @@ class Diff
      * $separator   - the separator between lines; this optional parameter
      *                defaults to '<br>'
      */
-    public static function toTable($diff, $indentation = '', $separator = '<br>')
-    {
+	public static function toTable($diff, $indentation = '', $separator = '<br>')
+	{
 
-        // initialise the HTML
-        $html = $indentation . "<table class=\"diff\">\n";
+		// initialise the HTML
+		$html = $indentation . "<table class=\"diff\">\n";
 
-        // loop over the lines in the diff
-        $index = 0;
-        while ($index < count($diff)) {
-            // determine the line type
-            switch ($diff[$index][1]) {
-                // display the content on the left and right
-                case self::UNMODIFIED:
-                    $leftCell = self::getCellContent(
-                        $diff,
-                        $indentation,
-                        $separator,
-                        $index,
-                        self::UNMODIFIED
-                    );
-                    $rightCell = $leftCell;
-                    break;
+		// loop over the lines in the diff
+		$index = 0;
+		while ($index < count($diff)) {
+			// determine the line type
+			switch ($diff[$index][1]) {
+				// display the content on the left and right
+				case self::UNMODIFIED:
+					$leftCell = self::getCellContent(
+						$diff,
+						$indentation,
+						$separator,
+						$index,
+						self::UNMODIFIED
+					);
+					$rightCell = $leftCell;
+					break;
 
-                // display the deleted on the left and inserted content on the right
-                case self::DELETED:
-                    $leftCell = self::getCellContent(
-                        $diff,
-                        $indentation,
-                        $separator,
-                        $index,
-                        self::DELETED
-                    );
-                    $rightCell = self::getCellContent(
-                            $diff,
-                            $indentation,
-                            $separator,
-                            $index,
-                            self::INSERTED
-                        );
-                    break;
+				// display the deleted on the left and inserted content on the right
+				case self::DELETED:
+					$leftCell = self::getCellContent(
+						$diff,
+						$indentation,
+						$separator,
+						$index,
+						self::DELETED
+					);
+					$rightCell = self::getCellContent(
+							$diff,
+							$indentation,
+							$separator,
+							$index,
+							self::INSERTED
+						);
+					break;
 
-                // display the inserted content on the right
-                case self::INSERTED:
-                    $leftCell = '';
-                    $rightCell = self::getCellContent(
-                        $diff,
-                        $indentation,
-                        $separator,
-                        $index,
-                        self::INSERTED
-                    );
-                    break;
-            }
+				// display the inserted content on the right
+				case self::INSERTED:
+					$leftCell = '';
+					$rightCell = self::getCellContent(
+						$diff,
+						$indentation,
+						$separator,
+						$index,
+						self::INSERTED
+					);
+					break;
+			}
 
-            // extend the HTML with the new row
-            $html .=
-                $indentation
-                . "  <tr>\n"
-                . $indentation
-                . '    <td class="diff'
-                . ($leftCell == $rightCell
-                ? 'Unmodified'
-                : ($leftCell == '' ? 'Blank' : 'Deleted'))
-                . '">'
-                . $leftCell
-                . "</td>\n"
-                . $indentation
-                . '    <td class="diff'
-                . ($leftCell == $rightCell
-                ? 'Unmodified'
-                : ($rightCell == '' ? 'Blank' : 'Inserted'))
-                . '">'
-                . $rightCell
-                . "</td>\n"
-                . $indentation
-                . "  </tr>\n";
-        }
+			// extend the HTML with the new row
+			$html .=
+				$indentation
+				. "  <tr>\n"
+				. $indentation
+				. '    <td class="diff'
+				. ($leftCell == $rightCell
+				? 'Unmodified'
+				: ($leftCell == '' ? 'Blank' : 'Deleted'))
+				. '">'
+				. $leftCell
+				. "</td>\n"
+				. $indentation
+				. '    <td class="diff'
+				. ($leftCell == $rightCell
+				? 'Unmodified'
+				: ($rightCell == '' ? 'Blank' : 'Inserted'))
+				. '">'
+				. $rightCell
+				. "</td>\n"
+				. $indentation
+				. "  </tr>\n";
+		}
 
-        // return the HTML
-        return $html . $indentation . "</table>\n";
-    }
+		// return the HTML
+		return $html . $indentation . "</table>\n";
+	}
 
-    /* Returns the content of the cell, for use in the toTable function. The
+	/* Returns the content of the cell, for use in the toTable function. The
      * parameters are:
      *
      * $diff        - the diff array
@@ -382,22 +382,22 @@ class Diff
      * $index       - the current index, passes by reference
      * $type        - the type of line
      */
-    private static function getCellContent($diff, $indentation, $separator, &$index, $type)
-    {
-        // initialise the HTML
-        $html = '';
+	private static function getCellContent($diff, $indentation, $separator, &$index, $type)
+	{
+		// initialise the HTML
+		$html = '';
 
-        // loop over the matching lines, adding them to the HTML
-        while ($index < count($diff) && $diff[$index][1] == $type) {
-            $html .=
-            '<span>'
-            . htmlspecialchars($diff[$index][0])
-                . '</span>'
-                . $separator;
-            $index++;
-        }
+		// loop over the matching lines, adding them to the HTML
+		while ($index < count($diff) && $diff[$index][1] == $type) {
+			$html .=
+			'<span>'
+			. htmlspecialchars($diff[$index][0])
+				. '</span>'
+				. $separator;
+			$index++;
+		}
 
-        // return the HTML
-        return $html;
-    }
+		// return the HTML
+		return $html;
+	}
 }
diff --git a/htdocs/ticket/css/styles.css.php b/htdocs/ticket/css/styles.css.php
index 914a3dba119..c6b14fd5df3 100644
--- a/htdocs/ticket/css/styles.css.php
+++ b/htdocs/ticket/css/styles.css.php
@@ -51,7 +51,7 @@ html {
 html {
 <?php
 if (! empty($conf->global->TICKET_SHOW_MODULE_LOGO)) {
-    print 'background: url("../public/img/bg_ticket.png") no-repeat 95% 90%;';
+	print 'background: url("../public/img/bg_ticket.png") no-repeat 95% 90%;';
 }
 ?>
 }
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index 92be17dcd47..ebdd1bd77c0 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -98,7 +98,7 @@ 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';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
 /* ************************************************************************** */
@@ -111,7 +111,7 @@ 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';
+	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_edit.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index 64cf4b21b2e..02992eafa04 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -35,7 +35,7 @@ require_once '../main.inc.php';
 // This can happen only with a bookmark or forged url call.
 if (!empty($_SESSION["dol_authmode"]) && ($_SESSION["dol_authmode"] == 'forceuser' || $_SESSION["dol_authmode"] == 'http'))
 {
-    unset($_SESSION["dol_login"]);
+	unset($_SESSION["dol_login"]);
 	die("Applicative disconnection should be useless when connection was made in mode ".$_SESSION["dol_authmode"]);
 }
 
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
index e0828cc07dd..5093f242326 100644
--- a/htdocs/variants/create_val.php
+++ b/htdocs/variants/create_val.php
@@ -43,9 +43,9 @@ if ($object->fetch($id) < 1) {
 
 if ($cancel)
 {
-    $action='';
-    header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$object->id);
-    exit();
+	$action='';
+	header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$object->id);
+	exit();
 }
 
 // None
diff --git a/htdocs/webservices/server_other.php b/htdocs/webservices/server_other.php
index 466cf3366da..0a80c205925 100644
--- a/htdocs/webservices/server_other.php
+++ b/htdocs/webservices/server_other.php
@@ -55,30 +55,30 @@ $server->wsdl->schemaTargetNamespace=$ns;
 
 // Define WSDL Authentication object
 $server->wsdl->addComplexType(
-    'authentication',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
-    	'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
-    	'login' => array('name'=>'login','type'=>'xsd:string'),
-        'password' => array('name'=>'password','type'=>'xsd:string'),
-        'entity' => array('name'=>'entity','type'=>'xsd:string'),
-    )
+	'authentication',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'dolibarrkey' => array('name'=>'dolibarrkey','type'=>'xsd:string'),
+		'sourceapplication' => array('name'=>'sourceapplication','type'=>'xsd:string'),
+		'login' => array('name'=>'login','type'=>'xsd:string'),
+		'password' => array('name'=>'password','type'=>'xsd:string'),
+		'entity' => array('name'=>'entity','type'=>'xsd:string'),
+	)
 );
 // Define WSDL Return object
 $server->wsdl->addComplexType(
-    'result',
-    'complexType',
-    'struct',
-    'all',
-    '',
-    array(
-        'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
-        'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
-    )
+	'result',
+	'complexType',
+	'struct',
+	'all',
+	'',
+	array(
+		'result_code' => array('name'=>'result_code','type'=>'xsd:string'),
+		'result_label' => array('name'=>'result_label','type'=>'xsd:string'),
+	)
 );
 
 // Define WSDL Return object for document
@@ -109,16 +109,16 @@ $styleuse='encoded';   // encoded/literal/literal wrapped
 
 // Register WSDL
 $server->register(
-    'getVersions',
-    // Entry values
-    array('authentication'=>'tns:authentication'),
-    // Exit values
-    array('result'=>'tns:result','dolibarr'=>'xsd:string','os'=>'xsd:string','php'=>'xsd:string','webserver'=>'xsd:string'),
-    $ns,
-    $ns.'#getVersions',
-    $styledoc,
-    $styleuse,
-    'WS to get Versions'
+	'getVersions',
+	// Entry values
+	array('authentication'=>'tns:authentication'),
+	// Exit values
+	array('result'=>'tns:result','dolibarr'=>'xsd:string','os'=>'xsd:string','php'=>'xsd:string','webserver'=>'xsd:string'),
+	$ns,
+	$ns.'#getVersions',
+	$styledoc,
+	$styleuse,
+	'WS to get Versions'
 );
 
 // Register WSDL
@@ -146,15 +146,15 @@ function getVersions($authentication)
 
 	if ($authentication['entity']) $conf->entity=$authentication['entity'];
 
-    // Init and check authentication
-    $objectresp=array();
-    $errorcode='';$errorlabel='';
-    $error=0;
-    $fuser=check_authentication($authentication, $error, $errorcode, $errorlabel);
-    // Check parameters
+	// Init and check authentication
+	$objectresp=array();
+	$errorcode='';$errorlabel='';
+	$error=0;
+	$fuser=check_authentication($authentication, $error, $errorcode, $errorlabel);
+	// Check parameters
 
 
-    if (! $error)
+	if (! $error)
 	{
 		$objectresp['result']=array('result_code'=>'OK', 'result_label'=>'');
 		$objectresp['dolibarr']=version_dolibarr();
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 0ce0e2f1bbd..17bf6c8ebde 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -121,7 +121,7 @@ if ($websiteid > 0 || $websitekey)
 
 $website = $object;
 
-// Check pageid received as aprameter
+// Check pageid received as parameter
 if ($pageid < 0) $pageid = 0;
 if (($pageid > 0 || $pageref) && $action != 'addcontainer')
 {
diff --git a/htdocs/website/samples/wrapper.php b/htdocs/website/samples/wrapper.php
index 24d32bdf281..35f2b410f78 100644
--- a/htdocs/website/samples/wrapper.php
+++ b/htdocs/website/samples/wrapper.php
@@ -109,14 +109,10 @@ if ($rss) {
 
     dol_syslog("build_exportfile Build export file format=".$format.", type=".$type.", cachedelay=".$cachedelay.", filename=".$filename.", filters size=".count($filters), LOG_DEBUG);
 
-    // Check parameters
-    if (empty($format)) return -1;
-
     // Clean parameters
     if (!$filename)
     {
-    	$extension = 'vcs';
-    	if ($format == 'ical') $extension = 'ics';
+    	$extension = 'rss';
     	$filename = $format.'.'.$extension;
     }
 
@@ -148,9 +144,7 @@ if ($rss) {
     	@chmod($outputfiletmp, octdec($conf->global->MAIN_UMASK));
 
     	// Write file
-    	//if ($format == 'vcal') $result=build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-    	//elseif ($format == 'ical') $result=build_calfile($format, $title, $desc, $eventarray, $outputfiletmp);
-    	if ($format == 'rss')  $result=build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
+    	$result=build_rssfile($format, $title, $desc, $eventarray, $outputfiletmp);
 
     	if ($result >= 0)
     	{
diff --git a/scripts/accountancy/export-thirdpartyaccount.php b/scripts/accountancy/export-thirdpartyaccount.php
index 9399066078f..e24a460f61e 100755
--- a/scripts/accountancy/export-thirdpartyaccount.php
+++ b/scripts/accountancy/export-thirdpartyaccount.php
@@ -33,7 +33,7 @@ $langs->loadLangs(array("companies", "compta", "main", "accountancy"));
 
 // Security check
 if (!$user->admin)
-    accessforbidden();
+	accessforbidden();
 
 // Date range
 $year = GETPOST("year");
diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php
index 4e5069b4fdc..eb5b794d3d1 100755
--- a/scripts/emailings/mailing-send.php
+++ b/scripts/emailings/mailing-send.php
@@ -328,7 +328,7 @@ if ($resql) {
 							dol_syslog("error for emailing id " . $id . " #" . $i . ($mail->error ? ' - ' . $mail->error : ''), LOG_DEBUG);
 
 							$sqlerror = "UPDATE " . MAIN_DB_PREFIX . "mailing_cibles";
-							$sqlerror .= " SET statut=-1, date_envoi=" . $db->idate($now) . " WHERE rowid=" . $obj->rowid;
+							$sqlerror .= " SET statut=-1, date_envoi='" . $db->idate($now) . "' WHERE rowid=" . $obj->rowid;
 							$resqlerror = $db->query($sqlerror);
 							if (! $resqlerror) {
 								dol_print_error($db);